[Midnightbsd-cvs] src [7358] trunk/lib/libc/stdlib/getenv.c: use the existing merge_env to clear the environment safely.

[laffer1 at midnightbsd.org]

Revision: 7358
          http://svnweb.midnightbsd.org/src/?rev=7358
Author:   laffer1
Date:     2015-11-01 15:19:57 -0500 (Sun, 01 Nov 2015)
Log Message:
-----------
use the existing merge_env to clear the environment safely.

Modified Paths:
--------------
    trunk/lib/libc/stdlib/getenv.c

Modified: trunk/lib/libc/stdlib/getenv.c
===================================================================
--- trunk/lib/libc/stdlib/getenv.c	2015-11-01 19:11:19 UTC (rev 7357)
+++ trunk/lib/libc/stdlib/getenv.c	2015-11-01 20:19:57 UTC (rev 7358)
@@ -690,17 +690,8 @@
 clearenv(void)
 {
         int envNdx;
+	*environ = NULL;
+	__merge_environ();
 
- 	if (envVars != NULL) {
-		for (envNdx = envVarsTotal - 1; envNdx >= 0; envNdx--)
-			if (! envVars[envNdx].putenv) {
-				free(envVars[envNdx].name);
-			}
-		free(envVars);
-		envVars = NULL;
-		*environ = NULL;
-	} else
-		*environ = NULL;
-
 	return (0);
 }