symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/IpUtils.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/IpUtils.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/IpUtils.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+17Lines changed: 17 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+17Lines changed: 17 additions & 0 deletions
@@ -87,6 +87,10 @@ public static function checkIp4($requestIp, $ip)
             $netmask = 32;
         }
 
+        if (false === ip2long($address)) {
+            return self::$checkedIps[$cacheKey] = false;
+        }
+
         return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
     }
 
 
@@ -82,4 +82,21 @@ public function testAnIpv6WithOptionDisabledIpv6()
 
         IpUtils::checkIp('2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65');
     }
+
+    /**
+     * @dataProvider invalidIpAddressData
+     */
+    public function testInvalidIpAddressesDoNotMatch($requestIp, $proxyIp)
+    {
+        $this->assertFalse(IpUtils::checkIp4($requestIp, $proxyIp));
+    }
+
+    public function invalidIpAddressData()
+    {
+        return array(
+            'invalid proxy wildcard' => array('192.168.20.13', '*'),
+            'invalid proxy missing netmask' => array('192.168.20.13', '0.0.0.0'),
+            'invalid request IP with invalid proxy wildcard' => array('0.0.0.0', '*'),
+        );
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,10 @@ public static function checkIp4($requestIp, $ip)`
`87`	`87`	`$netmask = 32;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ if (false === ip2long($address)) {`
	`91`	`+ return self::$checkedIps[$cacheKey] = false;`
	`92`	`+ }`
	`93`	`+`
`90`	`94`	`return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);`
`91`	`95`	`}`
`92`	`96`