symfony
diff --git a/Collapse file
‎src/Symfony/Component/HttpFoundation/IpUtils.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+6Lines changed: 6 additions & 0 deletions b/Collapse file
‎src/Symfony/Component/HttpFoundation/IpUtils.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+6Lines changed: 6 additions & 0 deletions
diff --git a/Collapse file
‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+24Lines changed: 24 additions & 0 deletions
@@ -231,9 +231,15 @@ public static function anonymize(string $ip): string
 
     /**
      * Checks if an IPv4 or IPv6 address is contained in the list of private IP subnets.
+     *
+     * @throws \ValueError When $requestIp is not a valid IP address
      */
     public static function isPrivateIp(string $requestIp): bool
     {
+        if (!filter_var($requestIp, \FILTER_VALIDATE_IP)) {
+            throw new \ValueError(\sprintf('"%s" is not a valid IP address.', $requestIp));
+        }
+
         return self::checkIp($requestIp, self::PRIVATE_SUBNETS);
     }
 
 
@@ -211,6 +211,30 @@ public static function getIsPrivateIpData(): array
         ];
     }
 
+    /**
+     * @dataProvider getIsPrivateIpInvalidData
+     */
+    public function testIsPrivateIpThrowsOnNonCanonicalIp(string $ip)
+    {
+        $this->expectException(\ValueError::class);
+        $this->expectExceptionMessage(\sprintf('"%s" is not a valid IP address.', $ip));
+
+        IpUtils::isPrivateIp($ip);
+    }
+
+    public static function getIsPrivateIpInvalidData(): array
+    {
+        return [
+            'decimal' => ['2130706433'],
+            'hexadecimal' => ['0x7f000001'],
+            'leading zero' => ['010.0.0.1'],
+            'short form' => ['127.1'],
+            'zone id' => ['fe80::1%eth0'],
+            'not an IP' => ['not-an-ip'],
+            'empty string' => [''],
+        ];
+    }
+
     public function testCacheSizeLimit()
     {
         $ref = new \ReflectionClass(IpUtils::class);