From d8cd7dac077e00121ce1e734a4b5ea883f692e91 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 19 Aug 2004 15:15:32 +0000 Subject: [PATCH] MFH: ip2long() issues --- ext/standard/basic_functions.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 9e0bf9bf5e..0cbf957a13 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1280,14 +1280,14 @@ PHP_FUNCTION(ip2long) convert_to_string_ex(str); - /* the only special case when we should return -1 ourselves, - * because inet_addr() considers it wrong. - */ - if (!strcasecmp(Z_STRVAL_PP(str), "255.255.255.255")) { - RETURN_LONG(-1); - } - if (Z_STRLEN_PP(str) == 0 || (ip = inet_addr(Z_STRVAL_PP(str))) == INADDR_NONE) { + /* 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))) { + RETURN_LONG(-1); + } + RETURN_FALSE; } -- 2.40.0