Fixed bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges)

diff --git a/NEWS b/NEWS
index feba2c88bfbf5c1225d6adc43da57bd4af6ff8bd..d4219c8e92ccf5d6536fdeffacc8b01bf4c8634a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@
 - Zend Engine:
   . Indirect reference to $this fails to resolve if direct $this is never used
     in method. (Scott)
+
+- Filter extension:
+  . Fixed bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges).
+    (Ilia)
     
 - Intl extension:
   . Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values).

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 6bf83b9cef20ae12c850b13f76c7507bbfcb5075..f6a7c82fd280a5511d5d3e59a741c29756db2c9f 100644 (file)
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -710,8 +710,11 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
                        if (flags & FILTER_FLAG_NO_RES_RANGE) {
                                if (
                                        (ip[0] == 0) ||
+                                       (ip[0] == 128 && ip[1] == 0) ||
+                                       (ip[0] == 191 && ip[1] == 255) ||
                                        (ip[0] == 169 && ip[1] == 254) ||
                                        (ip[0] == 192 && ip[1] == 0 && ip[2] == 2) ||
+                                       (ip[0] == 127 && ip[1] == 0 && ip[2] == 0 && ip[3] == 1) ||
                                        (ip[0] >= 224 && ip[0] <= 255)
                                ) {
                                        RETURN_VALIDATION_FAILED
@@ -732,6 +735,9 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
                                                RETURN_VALIDATION_FAILED
                                        }
                                }
+                               if (flags & FILTER_FLAG_NO_RES_RANGE && Z_STRLEN_P(value) == 3 && !strcmp("::1", Z_STRVAL_P(value))) {
+                                       RETURN_VALIDATION_FAILED
+                               }
                        }
                        break;
        }

diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index 10840aae74e0c3db6a8670d534bbb59520d6313b..13122bdc557975e8b1e7cc443e9e5259255094e5 100644 (file)
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -37,7 +37,7 @@ bool(false)
 string(9) "127.0.0.1"
 bool(false)
 string(12) "192.0.34.166"
-string(9) "127.0.0.1"
+bool(false)
 string(9) "192.0.0.1"
 string(12) "192.0.34.166"
 bool(false)

diff --git a/ext/filter/tests/bug53150.phpt b/ext/filter/tests/bug53150.phpt
new file mode 100644 (file)
index 0000000..4baa4db
--- /dev/null
+++ b/ext/filter/tests/bug53150.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges)
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(filter_var('127.0.0.1', FILTER_VALIDATE_IP));
+var_dump(filter_var("::1", FILTER_VALIDATE_IP));
+
+var_dump(filter_var('127.0.0.1', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var('::1', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+
+var_dump(filter_var('128.0.0.1', FILTER_VALIDATE_IP));
+var_dump(filter_var('128.0.0.1', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+
+var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP));
+var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+
+?>
+--EXPECT--     
+string(9) "127.0.0.1"
+string(3) "::1"
+bool(false)
+bool(false)
+string(9) "128.0.0.1"
+bool(false)
+string(11) "191.255.0.0"
+bool(false)