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

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 16222432ee7d71160cee8597ea6fbabd1a190149..feb150ccd23ce5964aaa129d53b8b240df706237 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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;
                        }
                }