From: Scott MacVicar Date: Fri, 30 May 2008 16:56:57 +0000 (+0000) Subject: MFH Fixed bug #43261 X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~128 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ae8e34bf4c2e98dc684a2425b0d9b0c53e715cd;p=php MFH Fixed bug #43261 (Use ^ as an escape character for Windows escapeshellcmd) --- diff --git a/ext/standard/exec.c b/ext/standard/exec.c index db4f3f6a39..0f00df2665 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -322,12 +322,12 @@ PHPAPI char *php_escape_shell_cmd(char *str) case '\x0A': /* excluding these two */ case '\xFF': #ifdef PHP_WIN32 - /* since Windows does not allow us to escape these chars, just remove them */ + /* This is Windows specific for enviromental variables */ case '%': - cmd[y++] = ' '; - break; -#endif + cmd[y++] = '^'; +#else cmd[y++] = '\\'; +#endif /* fall-through */ default: cmd[y++] = str[x];