bug #38099 Prevent parsing invalid octal digits as octal numbers (julienfalque)

fabpot · fabpot · commit 91b673903152 · 2020-09-08T06:53:29.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Prevent parsing invalid octal digits as octal numbers | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Values starting with `0` but containing `8` or `9` such as `0123456789` are not valid octal numbers, therefore they should be parsed as regular strings. This is consistent with how other invalid octal values are parsed, e.g. `01234567ab` already gets parsed as the string `"01234567ab"`. Commits ------- c7dcd82 Prevent parsing invalid octal digits as octal numbers
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -759,16 +759,16 @@ private static function evaluateScalar($scalar, $flags, $references = [])
 
                 switch (true) {
                     case ctype_digit($scalar):
-                        if ('0' === $scalar[0]) {
-                            return octdec(preg_replace('/[^0-7]/', '', $scalar));
+                        if (preg_match('/^0[0-7]+$/', $scalar)) {
+                            return octdec($scalar);
                         }
 
                         $cast = (int) $scalar;
 
                         return ($scalar === (string) $cast) ? $cast : $scalar;
                     case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
-                        if ('0' === $scalar[1]) {
-                            return -octdec(preg_replace('/[^0-7]/', '', substr($scalar, 1)));
+                        if (preg_match('/^-0[0-7]+$/', $scalar)) {
+                            return -octdec(substr($scalar, 1));
                         }
 
                         $cast = (int) $scalar;
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -853,11 +853,11 @@ public function phpConstTagWithEmptyValueProvider()
 
     public function testParsePositiveOctalNumberContainingInvalidDigits()
     {
-        self::assertSame(342391, Inline::parse('0123456789'));
+        self::assertSame('0123456789', Inline::parse('0123456789'));
     }
 
     public function testParseNegativeOctalNumberContainingInvalidDigits()
     {
-        self::assertSame(-342391, Inline::parse('-0123456789'));
+        self::assertSame('-0123456789', Inline::parse('-0123456789'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -853,11 +853,11 @@ public function phpConstTagWithEmptyValueProvider()`
`853`	`853`
`854`	`854`	`public function testParsePositiveOctalNumberContainingInvalidDigits()`
`855`	`855`	`{`
`856`		`- self::assertSame(342391, Inline::parse('0123456789'));`
	`856`	`+ self::assertSame('0123456789', Inline::parse('0123456789'));`
`857`	`857`	`}`
`858`	`858`
`859`	`859`	`public function testParseNegativeOctalNumberContainingInvalidDigits()`
`860`	`860`	`{`
`861`		`- self::assertSame(-342391, Inline::parse('-0123456789'));`
	`861`	`+ self::assertSame('-0123456789', Inline::parse('-0123456789'));`
`862`	`862`	`}`
`863`	`863`	`}`