diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-01-07 13:03:12 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-07 13:03:12 +0100 |
| commit | c0fae054c92cf73e5f7a7c32d624e43afabfd8e0 (patch) | |
| tree | c761082e074a1946414b6d04bf95a795a0a0a308 | |
| parent | 485c09a3765b900aea182ddd2dded2286fb0749a (diff) | |
| download | php-git-c0fae054c92cf73e5f7a7c32d624e43afabfd8e0.tar.gz | |
- fix the fix for bug #50524
| -rw-r--r-- | ext/standard/proc_open.c | 3 |
1 files changed, 2 insertions, 1 deletions
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)); |