ext/standard/basic_functions.c: perform basic input checks for ip2long()

Author: Girgias

ext/standard/basic_functions.c

@@ -593,10 +593,15 @@ PHP_FUNCTION(ip2long)
 	struct in_addr ip;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(addr, addr_len)
+		Z_PARAM_PATH(addr, addr_len)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (addr_len == 0 || inet_pton(AF_INET, addr, &ip) != 1) {
+	if (addr_len == 0) {
+		zend_argument_must_not_be_empty_error(1);
+		RETURN_THROWS();
+	}
+
+	if (inet_pton(AF_INET, addr, &ip) != 1) {
 		RETURN_FALSE;
 	}
 	RETURN_LONG(ntohl(ip.s_addr));

ext/standard/tests/network/ip.phpt

@@ -7,21 +7,20 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 
-$array = array(
+$array = [
     "127.0.0.1",
     "10.0.0.1",
     "255.255.255.255",
     "255.255.255.0",
     "0.0.0.0",
     "66.163.161.116",
-);
+];
 
 foreach ($array as $ip) {
     var_dump($long = ip2long($ip));
     var_dump(long2ip($long));
 }
 
-var_dump(ip2long(""));
 var_dump(ip2long("777.777.777.777"));
 var_dump(ip2long("111.111.111.111"));
 
@@ -43,7 +42,6 @@ string(7) "0.0.0.0"
 int(1118019956)
 string(14) "66.163.161.116"
 bool(false)
-bool(false)
 int(1869573999)
 string(13) "255.254.82.80"
 Done

ext/standard/tests/network/ip2long_errors.phpt

@@ -0,0 +1,20 @@
+--TEST--
+ip2long() error conditions
+--FILE--
+<?php
+
+try {
+	var_dump(ip2long(""));
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+	var_dump(ip2long("127\00.0.1"));
+} catch (Throwable $e) {
+	echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+ValueError: ip2long(): Argument #1 ($ip) must not be empty
+ValueError: ip2long(): Argument #1 ($ip) must not contain any null bytes
+

ext/standard/tests/network/ip_x86_64.phpt

@@ -7,21 +7,19 @@ if (PHP_INT_SIZE == 4) die("skip this test is for >32bit platform only");
 --FILE--
 <?php
 
-$array = array(
+$array = [
     "127.0.0.1",
     "10.0.0.1",
     "255.255.255.255",
     "255.255.255.0",
     "0.0.0.0",
     "66.163.161.116",
-);
+];
 
 foreach ($array as $ip) {
     var_dump($long = ip2long($ip));
     var_dump(long2ip($long));
 }
-
-var_dump(ip2long(""));
 var_dump(ip2long("777.777.777.777"));
 var_dump(ip2long("111.111.111.111"));
 
@@ -45,7 +43,6 @@ string(7) "0.0.0.0"
 int(1118019956)
 string(14) "66.163.161.116"
 bool(false)
-bool(false)
 int(1869573999)
 string(13) "255.254.82.80"
 string(15) "255.255.255.255"