- [DOC] MFH: improve fix for #43261 for % and "

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index b8b79b27a8b96ee3bf3b0829b5e13d49dac01833..794a67982f699968916157df34579312dde10c1b 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -287,9 +287,9 @@ PHPAPI char *php_escape_shell_cmd(char *str)
                }
 
                switch (str[x]) {
+#ifndef PHP_WIN32
                        case '"':
                        case '\'':
-#ifndef PHP_WIN32
                                if (!p && (p = memchr(str + x + 1, str[x], l - x - 1))) {
                                        /* noop */
                                } else if (p && *p == str[x]) {
@@ -300,10 +300,12 @@ PHPAPI char *php_escape_shell_cmd(char *str)
                                cmd[y++] = str[x];
                                break;
 #else
-                       /* This is Windows specific for enviromental variables */
+                       /* % is Windows specific for enviromental variables, ^%PATH% will 
+                               output PATH whil ^%PATH^% not. escapeshellcmd will escape all %.
+                       */
                        case '%':
-                               cmd[y++] = ' ';
-                               break;
+                       case '"':
+                       case '\'':
 #endif
                        case '#': /* This is character-set independent */
                        case '&':

diff --git a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
index 3da43e15f70ae4c6d34f036e380676d9ec9d1e0c..9fcb99188c2b7e2ab6f3f1a788c80ae07dcc029b 100644 (file)
--- a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
+++ b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
@@ -16,7 +16,8 @@ $data = array(
        '()[]{}$',
        '%^',
        '#&;`|*?',
-       '~<>\\'
+       '~<>\\',
+       '%NOENV%'
 );
 
 $count = 1;
@@ -38,9 +39,11 @@ string(6) "^?^<^>"
 -- Test 4 --
 string(14) "^(^)^[^]^{^}^$"
 -- Test 5 --
-string(2) "^^"
+string(4) "^%^^"
 -- Test 6 --
 string(14) "^#^&^;^`^|^*^?"
 -- Test 7 --
 string(8) "^~^<^>^\"
+-- Test 8 --
+string(9) "^%NOENV^%"
 Done