bug #45088 [Console] fix parsing escaped chars in StringInput (nicolas-grekas)

fabpot · fabpot · commit 6e67c623e171 · 2022-01-22T08:01:29.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] fix parsing escaped chars in StringInput | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #32182 | License | MIT | Doc PR | - Commits ------- f0a89ec [Console] fix parsing escaped chars in StringInput
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
@@ -24,7 +24,7 @@
  */
 class StringInput extends ArgvInput
 {
-    public const REGEX_STRING = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+    public const REGEX_STRING = '([^\s\\\\]+?)';
     public const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
     /**
@@ -47,14 +47,25 @@ private function tokenize(string $input): array
         $tokens = [];
         $length = \strlen($input);
         $cursor = 0;
+        $token = null;
         while ($cursor < $length) {
+            if ('\\' === $input[$cursor]) {
+                $token .= $input[++$cursor] ?? '';
+                ++$cursor;
+                continue;
+            }
+
             if (preg_match('/\s+/A', $input, $match, 0, $cursor)) {
+                if (null !== $token) {
+                    $tokens[] = $token;
+                    $token = null;
+                }
             } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, 0, $cursor)) {
-                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, -1)));
+                $token .= $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, -1)));
             } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
-                $tokens[] = stripcslashes(substr($match[0], 1, -1));
+                $token .= stripcslashes(substr($match[0], 1, -1));
             } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, 0, $cursor)) {
-                $tokens[] = stripcslashes($match[1]);
+                $token .= $match[1];
             } else {
                 // should never happen
                 throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($input, $cursor, 10)));
@@ -63,6 +74,10 @@ private function tokenize(string $input): array
             $cursor += \strlen($match[0]);
         }
 
+        if (null !== $token) {
+            $tokens[] = $token;
+        }
+
         return $tokens;
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Input/StringInputTest.php b/src/Symfony/Component/Console/Tests/Input/StringInputTest.php
@@ -71,6 +71,7 @@ public function getTokenizeData()
             ["--long-option='foo bar''another'", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
             ["--long-option='foo bar'\"another\"", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],
             ['foo -a -ffoo --long bar', ['foo', '-a', '-ffoo', '--long', 'bar'], '->tokenize() parses when several arguments and options'],
+            ["--arg=\\\"'Jenny'\''s'\\\"", ["--arg=\"Jenny's\""], '->tokenize() parses quoted quotes'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public function getTokenizeData()`
`71`	`71`	`["--long-option='foo bar''another'", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],`
`72`	`72`	`["--long-option='foo bar'\"another\"", ['--long-option=foo baranother'], '->tokenize() parses long options with a value'],`
`73`	`73`	`['foo -a -ffoo --long bar', ['foo', '-a', '-ffoo', '--long', 'bar'], '->tokenize() parses when several arguments and options'],`
	`74`	`+ ["--arg=\\\"'Jenny'\''s'\\\"", ["--arg=\"Jenny's\""], '->tokenize() parses quoted quotes'],`
`74`	`75`	`];`
`75`	`76`	`}`
`76`	`77`