summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-11-03 22:53:05 -0700
committerStanislav Malyshev <stas@php.net>2016-11-03 22:53:05 -0700
commit25d04ad8e3e4b415645f982178a274f7a36eeef6 (patch)
tree9a6bf6839715f09d5b609f2e0cac986f143aa038 /ext/standard
parent0bc6592307af27c81ab1717cc589adb2530565ac (diff)
parentd858b4c77fa28ff9b0a597141a58f51803bafc2b (diff)
downloadphp-git-25d04ad8e3e4b415645f982178a274f7a36eeef6.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Add length check for bzcompress too - fix for bug #73356 More string length checks & fixes More string length checks & fixes
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index bf9100b0d2..07ae161938 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -321,7 +321,7 @@ PHPAPI zend_string *php_escape_shell_cmd(char *str)
ZSTR_VAL(cmd)[y++] = str[x];
break;
#else
- /* % is Windows specific for environmental variables, ^%PATH% will
+ /* % is Windows specific for environmental variables, ^%PATH% will
output PATH while ^%PATH^% will not. escapeshellcmd->val will escape all % and !.
*/
case '%':