archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +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-09-30 18:11:38 +01:00
commit 9e6774d043
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/standard/tests/streams/gh15937.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
GH-15937 (stream overflow on timeout setting)
--SKIPIF--
<?php if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?>
--FILE--
<?php
$config = [
'http' => [
'timeout' => PHP_INT_MAX,
],
];
$ctx = stream_context_create($config);
var_dump(fopen("http://www.example.com", "r", false, $ctx));
?>
--EXPECTF--
resource(%d) of type (stream)

2
main/php_network.h
View file

@ -160,7 +160,7 @@ PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout);
/* timeval-to-timeout (for poll(2)) */ /* timeval-to-timeout (for poll(2)) */
static inline int php_tvtoto(struct timeval *timeouttv) static inline int php_tvtoto(struct timeval *timeouttv)
{ {
if (timeouttv) { if (timeouttv && timeouttv->tv_sec >= 0 && timeouttv->tv_sec <= ((INT_MAX - 1000) / 1000)) {
return (timeouttv->tv_sec * 1000) + (timeouttv->tv_usec / 1000); return (timeouttv->tv_sec * 1000) + (timeouttv->tv_usec / 1000);
} }
return -1; return -1;