[Process] Fix #9160 : escaping an argument with a trailing backslash …

…on windows fails
symfony · Mar 12, 2014 · 10e903a · 10e903a
1 parent 2c55a2d
commit 10e903a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Symfony/Component/Process/ProcessUtils.php b/src/Symfony/Component/Process/ProcessUtils.php
@@ -52,6 +52,9 @@ public static function escapeArgument($argument)
                 } elseif ('%' === $part) {
                     $escapedArgument .= '^%';
                 } else {
+                    if ('\\' === substr($part, -1)) {
+                        $part .= '\\';
+                    }
                     $escapedArgument .= escapeshellarg($part);
                 }
             }

diff --git a/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -31,6 +31,7 @@ public function dataArguments()
                 array('^%"path"^%', '%path%'),
                 array('"<|>"\\"" "\\""\'f"', '<|>" "\'f'),
                 array('""', ''),
+                array('"with\trailingbs\\\\"', 'with\trailingbs\\'),
             );
         }
 
@@ -39,6 +40,7 @@ public function dataArguments()
             array("'%path%'", '%path%'),
             array("'<|>\" \"'\\''f'", '<|>" "\'f'),
             array("''", ''),
+            array("'with\\trailingbs\\'", 'with\trailingbs\\'),
         );
     }
 }