diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Process] Fix: Arguments including space and quote are not correctly escaped (win)

Browse Source 
Bad
`"bin" "command" \""bin"\"" "\""another command"\"`

Better
`"bin" "command" "\"bin" \"another command\""`
This commit is contained in:
Michal Gebauer 2013-09-09 22:28:39 +02:00 committed by Romain Neutron
parent 9213a821d5
commit 85fb495a30
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Component/Process/ProcessUtils.php
View File

@ -46,6 +46,7 @@ class ProcessUtils
}
$escapedArgument = '';
$quote = false;
foreach (preg_split('/([%"])/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
if ('"' === $part) {
$escapedArgument .= '\\"';
@ -55,9 +56,17 @@ class ProcessUtils
if ('\\' === substr($part, -1)) {
$part .= '\\';
}
$escapedArgument .= escapeshellarg($part);
$part = escapeshellarg($part);
if ($part[0] === '"' && $part[strlen($part) - 1] === '"') {
$part = substr($part, 1, -1);
$quote = true;
}
$escapedArgument .= $part;
}
}
if ($quote) {
$escapedArgument = '"' . $escapedArgument . '"';
}
return $escapedArgument;
}