From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 6 May 2008 18:01:32 +0000 (+0000)
Subject: Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5a90feff0aa59bcdfe2b1194f73ba299fc7b0c8;p=php

Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
POSIX systems)

# Original patch by delphij at FreeBSD dot org
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index f5ddeab827..780e576d33 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3820,9 +3820,7 @@ static void php_putenv_destructor(putenv_entry *pe) /* {{{ */
 		SetEnvironmentVariable(pe->key, "bugbug");
 #endif
 		putenv(pe->previous_value);
-# if defined(PHP_WIN32)
 		efree(pe->previous_value);
-# endif
 	} else {
 # if HAVE_UNSETENV
 		unsetenv(pe->key);
@@ -4427,12 +4425,8 @@ PHP_FUNCTION(putenv)
 		pe.previous_value = NULL;
 		for (env = environ; env != NULL && *env != NULL; env++) {
 			if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') {	/* found it */
-#if defined(PHP_WIN32)
-				/* must copy previous value because MSVCRT's putenv can free the string without notice */
+				/* must copy previous value because putenv can free the string without notice */
 				pe.previous_value = estrdup(*env);
-#else
-				pe.previous_value = *env;
-#endif
 				break;
 			}
 		}