cvs: php-src /main network.c
| From: | Wez Furlong | Date: | Wed, 28 Jul 2004 23:15:25 +0000 |
| Subject: | cvs: php-src /main network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28039@lists.php.net to get a copy of this message | ||
wez Wed Jul 28 19:15:25 2004 EDT
Modified files:
/php-src/main network.c
Log:
Fix #29431: crash when parsing an invalid network address
http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.109&r2=1.110&ty=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.109 php-src/main/network.c:1.110
--- php-src/main/network.c:1.109 Fri Apr 9 15:18:59 2004
+++ php-src/main/network.c Wed Jul 28 19:15:25 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.109 2004/04/09 19:18:59 pollita Exp $ */
+/* $Id: network.c,v 1.110 2004/07/28 23:15:25 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -495,12 +495,15 @@
if (*addr == '[') {
colon = memchr(addr + 1, ']', addrlen-1);
if (!colon || colon[1] != ':') {
- return 0;
+ return FAILURE;
}
port = atoi(colon + 2);
addr++;
} else {
colon = memchr(addr, ':', addrlen);
+ if (!colon || colon[1] != ':') {
+ return FAILURE;
+ }
port = atoi(colon + 1);
}