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 2024-10-12 15:24:53 +01:00
commit 35c8a010c6
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/sockets/sockets.c
View file

@ -1452,7 +1452,8 @@ PHP_FUNCTION(socket_recvfrom)
/* overflow check */ /* overflow check */
/* Shouldthrow ? */ /* Shouldthrow ? */
if ((arg3 + 2) < 3) {
if (arg3 <= 0 || arg3 > ZEND_LONG_MAX - 1) {
RETURN_FALSE; RETURN_FALSE;
} }

19
ext/sockets/tests/socket_recv_overflow.phpt Normal file
View file

@ -0,0 +1,19 @@
--TEST--
socket_recvfrom overflow on length argument
--EXTENSIONS--
sockets
--SKIPIF--
<?php
if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
die('skip not valid for Windows.');
}
--FILE--
<?php
$s = socket_create(AF_UNIX, SOCK_DGRAM, 0);
$buf = $end = "";
var_dump(socket_recvfrom($s, $buf, PHP_INT_MAX, 0, $end));
var_dump(socket_recvfrom($s, $buf, -1, 0, $end));
?>
--EXPECT--
bool(false)
bool(false)