jani Thu Aug 16 22:17:10 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/network ip.phpt
Log:
MFH:- Fix bug #41946 (ip2long("") should return FALSE)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.59&r2=1.725.2.31.2.60&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.59
php-src/ext/standard/basic_functions.c:1.725.2.31.2.60
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.59 Thu Jul 19
15:49:45 2007
+++ php-src/ext/standard/basic_functions.c Thu Aug 16 22:17:10 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.59 2007/07/19 15:49:45 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.60 2007/08/16 22:17:10 jani Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4338,7 +4338,7 @@
/* the only special case when we should return -1 ourselves,
* because inet_addr() considers it wrong.
*/
- if (!memcmp(Z_STRVAL_PP(str), "255.255.255.255",
Z_STRLEN_PP(str))) {
+ if (!memcmp(Z_STRVAL_PP(str), "255.255.255.255",
sizeof("255.255.255.255") - 1)) {
RETURN_LONG(-1);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/network/ip.phpt
diff -u php-src/ext/standard/tests/network/ip.phpt:1.1.2.3
php-src/ext/standard/tests/network/ip.phpt:1.1.2.4
--- php-src/ext/standard/tests/network/ip.phpt:1.1.2.3 Thu Nov 16 13:49:20 2006
+++ php-src/ext/standard/tests/network/ip.phpt Thu Aug 16 22:17:10 2007
@@ -50,7 +50,7 @@
Warning: Wrong parameter count for ip2long() in %s on line %d
NULL
-int(-1)
+bool(false)
bool(false)
int(1869573999)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
