Fix #80007: Potential type confusion in unixtojd() parameter parsing

Also it fixes test on 32-bit armv7 and x86
- Test unixtojd() function : error conditions [ext/calendar/tests/unixtojd_error1.phpt]

Closes GH-6033

diff --git a/NEWS b/NEWS
index 4748996c26c8368db5f7fe7ffca31bd84f2c4db6..49ac4c5a6996649abb2878a5e7315f62e4f560d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.23
 
+- Calendar:
+  . Fixed bug #80007 (Potential type confusion in unixtojd() parameter parsing).
+    (Andy Postnikov)
 
 03 Sep 2020, PHP 7.3.22
 

diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c
index a8e81eb5414b83e9ccbeec3ca42458cd7ec342dd..da6a184e6c17a6035fb47c6641568417812f35d0 100644 (file)
--- a/ext/calendar/cal_unix.c
+++ b/ext/calendar/cal_unix.c
@@ -28,15 +28,18 @@
 PHP_FUNCTION(unixtojd)
 {
        time_t ts = 0;
+       zend_long tl = 0;
        struct tm *ta, tmbuf;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ts) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &tl) == FAILURE) {
                return;
        }
 
-       if (!ts) {
+       if (!tl) {
                ts = time(NULL);
-       } else if (ts < 0) {
+       } else if (tl >= 0) {
+               ts = (time_t) tl;
+       } else {
                RETURN_FALSE;
        }