bug #44537 [Config] In XmlUtils, avoid converting from octal every string starting with a 0 (alexandre-daubois)

fabpot · fabpot · commit ab1e9b9e6d63 · 2021-12-14T19:24:04.000-08:00
This PR was merged into the 4.4 branch. Discussion ---------- [Config] In XmlUtils, avoid converting from octal every string starting with a 0 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #41532  | License | MIT | Doc PR | N/A One word on the use of `intval` instead of `octdec`: `octdec` leads to deprecation notices when testing a non-octal string: ``` Invalid characters passed for attempted conversion, these have been ignored ``` While `intval` doesn't, which worth the use in my opinion. Commits ------- 30c3913 [Config] In XmlUtils, avoid converting from octal every string starting with a 0
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -169,6 +169,8 @@ public function getDataForPhpize(): array
             [1, '1'],
             [-1, '-1'],
             [0777, '0777'],
+            [-511, '-0777'],
+            ['0877', '0877'],
             [255, '0xFF'],
             [100.0, '1e2'],
             [-120.0, '-1.2E2'],
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -236,15 +236,11 @@ public static function phpize($value)
             case 'null' === $lowercaseValue:
                 return null;
             case ctype_digit($value):
-                $raw = $value;
-                $cast = (int) $value;
-
-                return '0' == $value[0] ? octdec($value) : (($raw === (string) $cast) ? $cast : $raw);
             case isset($value[1]) && '-' === $value[0] && ctype_digit(substr($value, 1)):
                 $raw = $value;
                 $cast = (int) $value;
 
-                return '0' == $value[1] ? octdec($value) : (($raw === (string) $cast) ? $cast : $raw);
+                return self::isOctal($value) ? \intval($value, 8) : (($raw === (string) $cast) ? $cast : $raw);
             case 'true' === $lowercaseValue:
                 return true;
             case 'false' === $lowercaseValue:
@@ -281,4 +277,13 @@ protected static function getXmlErrors($internalErrors)
 
         return $errors;
     }
+
+    private static function isOctal(string $str): bool
+    {
+        if ('-' === $str[0]) {
+            $str = substr($str, 1);
+        }
+
+        return $str === '0'.decoct(\intval($str, 8));
+    }
 }
