From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 7 Jan 2013 12:03:12 +0000 (+0100)
Subject: - fix the fix for bug #50524
X-Git-Tag: php-5.5.0alpha3~8^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0fae054c92cf73e5f7a7c32d624e43afabfd8e0;p=php

- fix the fix for bug #50524
---

diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index db63a67b77..9bf75868f0 100644
--- 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));