From b40c8657d4c687335eaac88e3467da2ba097ac70 Mon Sep 17 00:00:00 2001
From: Paul Ackersviller <packersv@users.sourceforge.net>
Date: Wed, 28 Nov 2007 02:51:13 +0000
Subject: Merge of 24113: createparamtable() was still messing with the
 internals of the environment even when USE_SET_UNSET_ENV.

---
 Src/params.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Src/params.c b/Src/params.c
index 3a185169e..7a546af18 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -681,13 +681,17 @@ createparamtable(void)
 					    getsparam(pm->nam), pm->flags);
 		    else
 			pm->env = ztrdup(*envp2);
+#ifndef USE_SET_UNSET_ENV
 		    *envp++ = pm->env;
+#endif
 		}
 	    }
 	}
     }
     popheap();
+#ifndef USE_SET_UNSET_ENV
     *envp = '\0';
+#endif
     opts[ALLEXPORT] = oae;
 
     pm = (Param) paramtab->getnode(paramtab, "HOME");
-- 
cgit 1.4.1