- fix the fix for bug #50524

diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index db63a67b77591aa4c7783daa053ef14c80e95d35..9bf75868f0a584ebf2001a72a98261aeac869cd6 100644 (file)
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -512,6 +512,7 @@ PHP_FUNCTION(proc_open)
        DWORD dwCreateFlags = 0;
        char *command_with_cmd;
        UINT old_error_mode;
+       char cur_cwd[MAXPATHLEN];
 #endif
 #ifdef NETWARE
        char** child_argv = NULL;
@@ -752,13 +753,13 @@ PHP_FUNCTION(proc_open)
 
 #ifdef PHP_WIN32
        if (cwd == NULL) {
-               char cur_cwd[MAXPATHLEN];
                char *getcwd_result;
                getcwd_result = VCWD_GETCWD(cur_cwd, MAXPATHLEN);
                if (!getcwd_result) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot get current directory");
                        goto exit_fail;
                }
+               cwd = cur_cwd;
        }
 
        memset(&si, 0, sizeof(si));