iliaa Mon Oct 20 23:22:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/filter logical_filters.c
Log:
Fixed bug #46343 (IPv6 address filter accepts invalid address)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.22.2.2&r2=1.1.2.22.2.3&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.22.2.2
php-src/ext/filter/logical_filters.c:1.1.2.22.2.3
--- php-src/ext/filter/logical_filters.c:1.1.2.22.2.2 Tue Mar 18 23:31:34 2008
+++ php-src/ext/filter/logical_filters.c Mon Oct 20 23:22:45 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.1.2.22.2.2 2008/03/18 23:31:34 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.22.2.3 2008/10/20 23:22:45 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -529,6 +529,7 @@
char *ipv4;
char *end;
int ip4elm[4];
+ char *s = str;
if (!memchr(str, ':', str_len)) {
return 0;
@@ -568,6 +569,8 @@
return 1;
}
compressed = 1;
+ } else if ((str - 1) == s) {
+ return 0;
}
}
n = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
