com php-src: - fix the fix for bug #50524: ext/standard/proc_ open.c
| From: | Pierre Joye | Date: | Mon, 07 Jan 2013 12:03:12 +0000 |
| Subject: | com php-src: - fix the fix for bug #50524: ext/standard/proc_ open.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70882@lists.php.net to get a copy of this message | ||
Commit: c0fae054c92cf73e5f7a7c32d624e43afabfd8e0
Author: Pierre Joye <pierre.php@gmail.com> Mon, 7 Jan 2013 13:03:12 +0100
Parents: 485c09a3765b900aea182ddd2dded2286fb0749a
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0fae054c92cf73e5f7a7c32d624e43afabfd8e0
Log:
- fix the fix for bug #50524
Bugs:
https://bugs.php.net/50524
Changed paths:
M ext/standard/proc_open.c
Diff:
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index db63a67..9bf7586 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));