fix #29737 in the right way with performance in mind

This commit is contained in:
Antony Dovgal 2004-08-19 15:14:04 +00:00
parent e156ed7433
commit ca28e37be1

View file

@ -1365,14 +1365,14 @@ PHP_FUNCTION(ip2long)
convert_to_string_ex(str);
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 (!strcasecmp(Z_STRVAL_PP(str), "255.255.255.255")) {
if (!memcmp(Z_STRVAL_PP(str), "255.255.255.255", Z_STRLEN_PP(str))) {
RETURN_LONG(-1);
}
if (Z_STRLEN_PP(str) == 0 || (ip = inet_addr(Z_STRVAL_PP(str))) == INADDR_NONE) {
RETURN_FALSE;
}