bug #21279 #20411 fix Yaml parsing for very long quoted strings (RichardBradley)

xabbuh · xabbuh · commit c18c93b51cf2 · 2017-01-14T08:26:19.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- #20411 fix Yaml parsing for very long quoted strings | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20411 | License | MIT | Doc PR | no This fixes #20411, a YAML string with too many backslash escapes can trigger a `PREG_BACKTRACK_LIMIT_ERROR` error in the Yaml parser. There should be no behavioural change other than the bug fix I have included a test which fails before this fix and passes after this fix. Commits ------- 51bca66 #20411 fix Yaml parsing for very long quoted strings
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -21,7 +21,7 @@
  */
 class Inline
 {
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
 
     private static $exceptionOnInvalidType = false;
     private static $objectSupport = false;
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -410,4 +410,14 @@ public function testNotSupportedMissingValue()
     {
         Inline::parse('{this, is not, supported}');
     }
+
+    public function testVeryLongQuotedStrings()
+    {
+        $longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);
+
+        $yamlString = Inline::dump(array('longStringWithQuotes' => $longStringWithQuotes));
+        $arrayFromYaml = Inline::parse($yamlString);
+
+        $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class Inline`
`23`	`23`	`{`
`24`		`- const REGEX_QUOTED_STRING = '(?:"([^"\\\\](?:\\\\.[^"\\\\]))"\|\'([^\'](?:\'\'[^\']))\')';`
	`24`	`+ const REGEX_QUOTED_STRING = '(?:"([^"\\\\]+(?:\\\\.[^"\\\\]+)+)"\|\'([^\']+(?:\'\'[^\']+)+)\')';`
`25`	`25`
`26`	`26`	`private static $exceptionOnInvalidType = false;`
`27`	`27`	`private static $objectSupport = false;`
Original file line number	Diff line number	Diff line change
`@@ -410,4 +410,14 @@ public function testNotSupportedMissingValue()`
`410`	`410`	`{`
`411`	`411`	`Inline::parse('{this, is not, supported}');`
`412`	`412`	`}`
	`413`	`+`
	`414`	`+ public function testVeryLongQuotedStrings()`
	`415`	`+ {`
	`416`	`+ $longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);`
	`417`	`+`
	`418`	`+ $yamlString = Inline::dump(array('longStringWithQuotes' => $longStringWithQuotes));`
	`419`	`+ $arrayFromYaml = Inline::parse($yamlString);`
	`420`	`+`
	`421`	`+ $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);`
	`422`	`+ }`
`413`	`423`	`}`