Merge branch 'PHP-8.3' into PHP-8.4

devnexen · devnexen · commit c8bead8393c6 · 2025-02-25T21:55:46.000Z
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -915,7 +915,7 @@ PHP_FUNCTION(socket_read)
 	ENSURE_SOCKET_VALID(php_sock);
 
 	/* overflow check */
-	if ((length + 1) < 2) {
+	if (length <= 0 || length == ZEND_LONG_MAX) {
 		RETURN_FALSE;
 	}
 
@@ -1365,7 +1365,7 @@ PHP_FUNCTION(socket_recv)
 	ENSURE_SOCKET_VALID(php_sock);
 
 	/* overflow check */
-	if ((len + 1) < 2) {
+	if (len <= 0 || len == ZEND_LONG_MAX) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/sockets/tests/gh17921.phpt b/ext/sockets/tests/gh17921.phpt
@@ -0,0 +1,18 @@
+--TEST--
+GH-16267 - overflow on socket_strerror argument
+--EXTENSIONS--
+sockets
+--FILE--
+<?php
+$s_c_l = socket_create_listen(0);
+var_dump(socket_read($s_c_l, PHP_INT_MAX));
+var_dump(socket_read($s_c_l, PHP_INT_MIN));
+$a = "";
+var_dump(socket_recv($s_c_l, $a, PHP_INT_MAX, 0));
+var_dump(socket_recv($s_c_l, $a, PHP_INT_MIN, 0));
+?>
+--EXPECT--
+bool(false)
+bool(false)
+bool(false)
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ PHP_FUNCTION(socket_read)`
`915`	`915`	`ENSURE_SOCKET_VALID(php_sock);`
`916`	`916`
`917`	`917`	`/* overflow check */`
`918`		`- if ((length + 1) < 2) {`
	`918`	`+ if (length <= 0 \|\| length == ZEND_LONG_MAX) {`
`919`	`919`	`RETURN_FALSE;`
`920`	`920`	`}`
`921`	`921`
`@@ -1365,7 +1365,7 @@ PHP_FUNCTION(socket_recv)`
`1365`	`1365`	`ENSURE_SOCKET_VALID(php_sock);`
`1366`	`1366`
`1367`	`1367`	`/* overflow check */`
`1368`		`- if ((len + 1) < 2) {`
	`1368`	`+ if (len <= 0 \|\| len == ZEND_LONG_MAX) {`
`1369`	`1369`	`RETURN_FALSE;`
`1370`	`1370`	`}`
`1371`	`1371`