bug #20335 [Yaml] Fix String offset cast error in Inline parser (romainneutron)

fabpot · fabpot · commit a257cb59ecb1 · 2016-11-02T07:03:22.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [Yaml] Fix String offset cast error in Inline parser | Q | A | | --- | --- | | Branch? | 3.2/master | | Bug fix? | yes | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Tests pass? | yes | | Fixed tickets | N/A | | License | MIT | Commits ------- bc095a5 [Yaml] Fix String offset cast error in Inline parser
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -458,7 +458,10 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
 
             // key
             $key = self::parseScalar($mapping, $flags, array(':', ' '), array('"', "'"), $i, false);
-            $i = strpos($mapping, ':', $i);
+
+            if (false === $i = strpos($mapping, ':', $i)) {
+                break;
+            }
 
             if (!isset($mapping[$i + 1]) || ' ' !== $mapping[$i + 1]) {
                 @trigger_error('Omitting the space after the colon that follows a mapping key definition is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -654,4 +654,13 @@ public function getInvalidBinaryData()
             'misplaced equals character' => array('!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),
         );
     }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage Malformed inline YAML string {this, is not, yaml}
+     */
+    public function testStringOffsetCastError()
+    {
+        Inline::parse('{this, is not, yaml}');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -654,4 +654,13 @@ public function getInvalidBinaryData()`
`654`	`654`	`'misplaced equals character' => array('!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),`
`655`	`655`	`);`
`656`	`656`	`}`
	`657`	`+`
	`658`	`+ /**`
	`659`	`+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
	`660`	`+ * @expectedExceptionMessage Malformed inline YAML string {this, is not, yaml}`
	`661`	`+ */`
	`662`	`+ public function testStringOffsetCastError()`
	`663`	`+ {`
	`664`	`+ Inline::parse('{this, is not, yaml}');`
	`665`	`+ }`
`657`	`666`	`}`