[Yaml] Throw parse error on unfinished inline map

nicolas-grekas · nicolas-grekas · commit 43599362a2c3 · 2018-04-06T13:01:31.000+02:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -231,6 +231,9 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
 
             if (null !== $delimiters) {
                 $tmp = ltrim(substr($scalar, $i), ' ');
+                if ('' === $tmp) {
+                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)));
+                }
                 if (!in_array($tmp[0], $delimiters)) {
                     throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
                 }
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -432,4 +432,13 @@ public function testTheEmptyStringIsAValidMappingKey()
     {
         $this->assertSame(array('' => 'foo'), Inline::parse('{ "": foo }'));
     }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage Unexpected end of line, expected one of ",}".
+     */
+    public function testUnfinishedInlineMap()
+    {
+        Inline::parse("{abc: 'def'");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,9 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter`
`231`	`231`
`232`	`232`	`if (null !== $delimiters) {`
`233`	`233`	`$tmp = ltrim(substr($scalar, $i), ' ');`
	`234`	`+ if ('' === $tmp) {`
	`235`	`+ throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)));`
	`236`	`+ }`
`234`	`237`	`if (!in_array($tmp[0], $delimiters)) {`
`235`	`238`	`throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));`
`236`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -432,4 +432,13 @@ public function testTheEmptyStringIsAValidMappingKey()`
`432`	`432`	`{`
`433`	`433`	`$this->assertSame(array('' => 'foo'), Inline::parse('{ "": foo }'));`
`434`	`434`	`}`
	`435`	`+`
	`436`	`+ /**`
	`437`	`+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
	`438`	`+ * @expectedExceptionMessage Unexpected end of line, expected one of ",}".`
	`439`	`+ */`
	`440`	`+ public function testUnfinishedInlineMap()`
	`441`	`+ {`
	`442`	`+ Inline::parse("{abc: 'def'");`
	`443`	`+ }`
`435`	`444`	`}`