php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

MFH: revert patch that causes invalid reads/crashes on Linux

Browse Source
This commit is contained in:
Antony Dovgal
2008-05-12 08:47:01 +00:00
parent 907fa66507
commit ea62779338
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/standard/basic_functions.c
View File

@@ -3820,7 +3820,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);
@@ -4425,8 +4427,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;
}
}