feedback 2

Author: devnexen

ext/ftp/php_ftp.c

@@ -158,11 +158,18 @@ PHP_FUNCTION(ftp_connect)
 		RETURN_THROWS();
 	}
 
+	const zend_long timeoutmax = (zend_long)((double) PHP_TIMEOUT_ULL_MAX / 1000000.0);
+
 	if (timeout_sec <= 0) {
 		zend_argument_value_error(3, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
+	if (timeout_sec >= timeoutmax) {
+		zend_argument_value_error(3, "must be less than " ZEND_LONG_FMT, timeoutmax);
+		RETURN_THROWS();
+	}
+
 	/* connect */
 	if (!(ftp = ftp_open(host, (short)port, timeout_sec))) {
 		RETURN_FALSE;

ext/ftp/tests/gh20601.phpt

@@ -15,5 +15,5 @@ try {
 	echo $e->getMessage();
 }
 ?>
---EXPECT--
-timeout value overflow
+--EXPECTF--
+ftp_connect(): Argument #3 ($timeout) must be less than %d

main/network.c

@@ -315,24 +315,18 @@ static inline void sub_times(struct timeval a, struct timeval b, struct timeval
 	}
 }
 
-static inline zend_result php_network_set_limit_time(struct timeval *limit_time,
+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;
-
-	if (limit_time->tv_sec >= (timeoutmax - timeout->tv_sec)) {
-		zend_value_error("timeout value overflow");
-		return FAILURE;
-	}
-
+	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) {
 		limit_time->tv_usec -= 1000000;
 		limit_time->tv_sec++;
 	}
-	return SUCCESS;
 }
 #endif
 
@@ -399,11 +393,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd,
 	if (timeout) {
 		memcpy(&working_timeout, timeout, sizeof(working_timeout));
 #if HAVE_GETTIMEOFDAY
-		if (UNEXPECTED(php_network_set_limit_time(&limit_time, &working_timeout) == FAILURE)) {
-			error = ERANGE;
-			ret = -1;
-			goto ok;
-		}
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
 	}
 
@@ -861,10 +851,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 	if (timeout) {
 		memcpy(&working_timeout, timeout, sizeof(working_timeout));
 #if HAVE_GETTIMEOFDAY
-		if (UNEXPECTED(php_network_set_limit_time(&limit_time, &working_timeout) == FAILURE)) {
-			php_network_freeaddresses(psal);
-			return -1;
-		}
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
 	}