com php-src: Merge branch 'PHP-5.6': ext/standard/exec.c

Commit: 00adcbd3e965e6a219f7236ff4b365ef6ffa96f3 Author: Christoph M. Becker <cmb@php.net> Wed, 24 Jun 2015 00:47:18 +0200 Parents: e08d27d650a97e8a27f471f30b7a1b021f43cf75 e181931f77c5815f4a9bacbbef9af8008aea6b1f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00adcbd3e965e6a219f7236ff4b365ef6ffa96f3 Log: Merge branch 'PHP-5.6' * PHP-5.6: updated NEWS Fixed bug #69768 (escapeshell*() doesn't cater to !) bump API version to 6.8 Bugs: https://bugs.php.net/69768 Changed paths: MM ext/standard/exec.c Diff: diff --cc ext/standard/exec.c index 60fd7ba,66d4537..d13ac45 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@@ -277,15 -275,16 +277,16 @@@ PHPAPI zend_string *php_escape_shell_cm } else if (p && *p == str[x]) { p = NULL; } else { - cmd[y++] = '\\'; + cmd->val[y++] = '\\'; } - cmd[y++] = str[x]; + cmd->val[y++] = str[x]; break; #else - /* % is Windows specific for environmental variables, ^%PATH% will - output PATH whil ^%PATH^% not. escapeshellcmd->val will escape all %. - /* % is Windows specific for enviromental variables, ^%PATH% will - output PATH while ^%PATH^% will not. escapeshellcmd will escape all % and !. ++ /* % is Windows specific for environmental variables, ^%PATH% will ++ output PATH while ^%PATH^% will not. escapeshellcmd->val will escape all % and !. */ case '%': + case '!': case '"': case '\'': #endif @@@ -369,7 -367,8 +370,8 @@@ PHPAPI zend_string *php_escape_shell_ar #ifdef PHP_WIN32 case '"': case '%': + case '!': - cmd[y++] = ' '; + cmd->val[y++] = ' '; break; #else case '\'':