diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-01-07 13:04:29 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-07 13:04:29 +0100 |
| commit | f4142a92b2ecfa0fdf89ec83bb41c2a46b299973 (patch) | |
| tree | ea4fd447dfe4af92223c3ecc6e434869f5dbf340 | |
| parent | 8a481c711a1c899971494d88086701ca783c6795 (diff) | |
| parent | a71e91626a3a72d360c285d0c78a16dbac6a0840 (diff) | |
| download | php-git-f4142a92b2ecfa0fdf89ec83bb41c2a46b299973.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- 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 6373751107..1edfe78849 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -438,6 +438,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; @@ -676,13 +677,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)); |