symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/IpUtils.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/IpUtils.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+1Lines changed: 1 addition & 0 deletions
@@ -61,11 +61,14 @@ public static function checkIp($requestIp, $ips)
      */
     public static function checkIp4($requestIp, $ip)
     {
+        if (!filter_var($requestIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            return false;
+        }
+
         if (false !== strpos($ip, '/')) {
             list($address, $netmask) = explode('/', $ip, 2);
 
             if ($netmask === '0') {
-                // Ensure IP is valid - using ip2long below implicitly validates, but we need to do it manually here
                 return filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
             }
 
 
@@ -37,6 +37,7 @@ public function testIpv4Provider()
             array(true, '1.2.3.4', '0.0.0.0/0'),
             array(true, '1.2.3.4', '192.168.1.0/0'),
             array(false, '1.2.3.4', '256.256.256/0'), // invalid CIDR notation
+            array(false, 'an_invalid_ip', '192.168.1.0/24'),
         );
     }
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public function testIpv4Provider()`
`37`	`37`	`array(true, '1.2.3.4', '0.0.0.0/0'),`
`38`	`38`	`array(true, '1.2.3.4', '192.168.1.0/0'),`
`39`	`39`	`array(false, '1.2.3.4', '256.256.256/0'), // invalid CIDR notation`
	`40`	`+ array(false, 'an_invalid_ip', '192.168.1.0/24'),`
`40`	`41`	`);`
`41`	`42`	`}`
`42`	`43`