archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-02-25 21:56:01 +00:00
commit d6cd754121
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/sockets/sockets.c
View file

@ -938,7 +938,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;
}
@ -1433,7 +1433,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;
}

18
ext/sockets/tests/gh17921.phpt Normal file
View file

@ -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)