From 86cf005ca2619171c7832ff65e1cd703d2ea79c5 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 12 May 2008 08:47:29 +0000 Subject: MFH: revert patch that causes invalid reads/crashes on Linux --- ext/standard/basic_functions.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ext/standard') diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 330f717c69..cec0b1f636 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3859,7 +3859,9 @@ 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); @@ -4459,8 +4461,12 @@ 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 */ - /* must copy previous value because putenv can free the string without notice */ +#if defined(PHP_WIN32) + /* must copy previous value because MSVCRT's putenv can free the string without notice */ pe.previous_value = estrdup(*env); +#else + pe.previous_value = *env; +#endif break; } } -- cgit v1.2.1