Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #80007: Potential type confusion in unixtojd() parameter parsing

Author: cmb69

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.0.0beta3
 
+- Calendar:
+  . Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
+    (Andy Postnikov)
+
 - DOM:
   . Fixed bug #79968 (DOMChildNode API crash on unattached nodes). (Benjamin)
 

ext/calendar/cal_unix.c

@@ -25,16 +25,19 @@
 PHP_FUNCTION(unixtojd)
 {
 	time_t ts;
-	zend_bool ts_is_null = 1;
+	zend_long tl = 0;
+	zend_bool tl_is_null = 1;
 	struct tm *ta, tmbuf;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &ts, &ts_is_null) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l!", &tl, &tl_is_null) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	if (ts_is_null) {
+	if (tl_is_null) {
 		ts = time(NULL);
-	} else if (ts < 0) {
+	} else if (tl >= 0) {
+		ts = (time_t) tl;
+	} else {
 		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}