Make ASAN happy

marc-mabe · marc-mabe · commit 491db8ba570c · 2023-11-25T11:38:55.000+01:00
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -2513,13 +2513,10 @@ PHPAPI void php_date_initialize_from_ts_long(php_date_obj *dateobj, zend_long se
 PHPAPI bool php_date_initialize_from_ts_double(php_date_obj *dateobj, double ts) /* {{{ */
 {
 	double sec_dval = trunc(ts);
-	zend_long sec = (zend_long)sec_dval;
-	int usec = (int)(fmod(ts, 1) * 1000000);
+	zend_long sec;
+	int usec;
 
-	if (UNEXPECTED(isnan(sec_dval)
-		|| !PHP_DATE_DOUBLE_FITS_LONG(sec_dval)
-		|| (sec == TIMELIB_LONG_MIN && usec < 0)
-	)) {
+	if (UNEXPECTED(isnan(sec_dval) || !PHP_DATE_DOUBLE_FITS_LONG(sec_dval))) {
 		zend_throw_error(
 			date_ce_date_range_error,
 			"Seconds must be a finite number between " TIMELIB_LONG_FMT " and " TIMELIB_LONG_FMT ", %g given",
@@ -2530,7 +2527,21 @@ PHPAPI bool php_date_initialize_from_ts_double(php_date_obj *dateobj, double ts)
 		return false;
 	}
 
+	sec = (zend_long)sec_dval;
+	usec = (int)(fmod(ts, 1) * 1000000);
+
 	if (UNEXPECTED(usec < 0)) {
+		if (UNEXPECTED(sec == TIMELIB_LONG_MIN)) {
+			zend_throw_error(
+				date_ce_date_range_error,
+				"Seconds must be a finite number between " TIMELIB_LONG_FMT " and " TIMELIB_LONG_FMT ", %g given",
+				TIMELIB_LONG_MIN,
+				TIMELIB_LONG_MAX,
+				sec_dval
+			);
+			return false;
+		}
+	
 		sec = sec - 1;
 		usec = 1000000 + usec;
 	}
