php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20601: ftp_connect() timeout argument overflow.
This commit is contained in:
David Carlier
2025-11-29 23:06:15 +00:00
parent 848269d6a8 1701589884
commit 227541cb96
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/network.c
View File

@@ -317,6 +317,8 @@ static inline void php_network_set_limit_time(struct timeval *limit_time,
struct timeval *timeout)
{
gettimeofday(limit_time, NULL);
const double timeoutmax = (double) PHP_TIMEOUT_ULL_MAX / 1000000.0;
ZEND_ASSERT(limit_time->tv_sec < (timeoutmax - timeout->tv_sec));
limit_time->tv_sec += timeout->tv_sec;
limit_time->tv_usec += timeout->tv_usec;
if (limit_time->tv_usec >= 1000000) {