Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #80185: jdtounix() fails after 2037

Author: cmb69

ext/calendar/cal_unix.c

@@ -21,6 +21,8 @@
 #include "sdncal.h"
 #include <time.h>
 
+#define SECS_PER_DAY (24 * 3600)
+
 /* {{{ Convert UNIX timestamp to Julian Day */
 PHP_FUNCTION(unixtojd)
 {
@@ -60,11 +62,11 @@ PHP_FUNCTION(jdtounix)
 	}
 	uday -= 2440588 /* J.D. of 1.1.1970 */;
 
-	if (uday < 0 || uday > 24755) {
-		zend_value_error("jday must be within the Unix epoch");
+	if (uday < 0 || uday > ZEND_LONG_MAX / SECS_PER_DAY) { /* before beginning of unix epoch or greater than representable */
+		zend_value_error("jday must be between 2440588 and " ZEND_LONG_FMT, ZEND_LONG_MAX / SECS_PER_DAY + 2440588);
 		RETURN_THROWS();
 	}
 
-	RETURN_LONG(uday * 24 * 3600);
+	RETURN_LONG(uday * SECS_PER_DAY);
 }
 /* }}} */

ext/calendar/tests/bug80185.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #80185 (jdtounix() fails after 2037)
+--SKIPIF--
+<?php
+if (!extension_loaded('calendar')) die('skip ext/calendar required');
+if (PHP_INT_SIZE != 8) die("skip for 64bit platforms only");
+?>
+--FILE--
+<?php
+var_dump(jdtounix(2465712));
+var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440588));
+try {
+    var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440589));
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+int(2170713600)
+int(9223372036854720000)
+jday must be between 2440588 and 106751993607888

ext/calendar/tests/bug80185_32bit.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Bug #80185 (jdtounix() fails after 2037)
+--SKIPIF--
+<?php
+if (!extension_loaded('calendar')) die('skip ext/calendar required');
+if (PHP_INT_SIZE != 4) die("skip for 32bit platforms only");
+?>
+--FILE--
+<?php
+try {
+    var_dump(jdtounix(2465712));
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), PHP_EOL;
+}
+var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440588));
+try {
+    var_dump(jdtounix(PHP_INT_MAX / 86400 + 2440589));
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+jday must be between 2440588 and 2465443
+int(2147472000)
+jday must be between 2440588 and 2465443

ext/calendar/tests/jdtounix_error1.phpt

@@ -15,4 +15,4 @@ try {
 }
 ?>
 --EXPECT--
-jday must be within the Unix epoch
+jday must be between 2440588 and 2465443