Added PHP_DATE_SIZEOF_LONG/PHP_DATE_DOUBLE_FITS_LONG similar to SIZEOF_ZEND_LONG/ZEND_DOUBLE_FITS_LONG

Author: marc-mabe

ext/date/php_date.c

@@ -2522,14 +2522,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);
-
-	if (UNEXPECTED(isnan(sec_dval)
-		|| sec_dval > (double)TIMELIB_LONG_MAX
-		|| sec_dval < (double)TIMELIB_LONG_MIN
-		|| (sec == TIMELIB_LONG_MIN && usec < 0)
-	)) {
+	zend_long sec;
+	int usec;
+
+	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",
@@ -2540,7 +2536,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;
 	}

ext/date/php_date.h

@@ -20,6 +20,23 @@
 #include "lib/timelib.h"
 #include "Zend/zend_hash.h"
 
+/* Same as SIZEOF_ZEND_LONG but using TIMELIB_LONG_MAX/MIN */
+#if TIMELIB_LONG_MAX == 2147483647
+#	define PHP_DATE_SIZEOF_LONG 4
+#elif TIMELIB_LONG_MAX == 9223372036854775807
+#	define PHP_DATE_SIZEOF_LONG 8
+#else
+#	error "Unknown TIMELIB LONG SIZE"
+#endif
+
+/* Same as ZEND_DOUBLE_FITS_LONG but using TIMELIB_LONG_MAX/MIN */
+#if PHP_DATE_SIZEOF_LONG == 4
+#	define PHP_DATE_DOUBLE_FITS_LONG(d) (!((d) > (double)TIMELIB_LONG_MAX || (d) < (double)TIMELIB_LONG_MIN))
+#elif PHP_DATE_SIZEOF_LONG == 8
+	/* >= as (double)TIMELIB_LONG_MAX is outside signed range */
+#	define PHP_DATE_DOUBLE_FITS_LONG(d) (!((d) >= (double)TIMELIB_LONG_MAX || (d) < (double)TIMELIB_LONG_MIN))
+#endif
+
 #include "php_version.h"
 #define PHP_DATE_VERSION PHP_VERSION