cvs: php-src /ext/filter logical_filters.c
| From: | Ilia Alshanetsky | Date: | Mon, 20 Oct 2008 23:23:53 +0000 |
| Subject: | cvs: php-src /ext/filter logical_filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53619@lists.php.net to get a copy of this message | ||
iliaa Mon Oct 20 23:23:53 2008 UTC
Modified files:
/php-src/ext/filter logical_filters.c
Log:
MFB: Fixed bug #46343 (IPv6 address filter accepts invalid address)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.28 php-src/ext/filter/logical_filters.c:1.29
--- php-src/ext/filter/logical_filters.c:1.28 Tue Mar 18 23:32:56 2008
+++ php-src/ext/filter/logical_filters.c Mon Oct 20 23:23:53 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: logical_filters.c,v 1.28 2008/03/18 23:32:56 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.29 2008/10/20 23:23:53 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -533,6 +533,7 @@
char *ipv4;
char *end;
int ip4elm[4];
+ char *s = str;
if (!memchr(str, ':', str_len)) {
return 0;
@@ -572,6 +573,8 @@
return 1;
}
compressed = 1;
+ } else if ((str - 1) == s) {
+ return 0;
}
}
n = 0;