php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source
This commit is contained in:
David Carlier
2024-10-05 10:48:08 +01:00
parent 4ac65b4c6b 71e5d77f39
commit 3b9676762b
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/calendar/cal_unix.c
View File

@@ -60,13 +60,13 @@ PHP_FUNCTION(jdtounix)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &uday) == FAILURE) {
RETURN_THROWS();
}
uday -= 2440588 /* J.D. of 1.1.1970 */;
if (uday < 0 || uday > ZEND_LONG_MAX / SECS_PER_DAY) { /* before beginning of unix epoch or greater than representable */
if (uday < 2440588 || (uday - 2440588) > (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();
}
uday -= 2440588 /* J.D. of 1.1.1970 */;
RETURN_LONG(uday * SECS_PER_DAY);
}
/* }}} */

21
ext/calendar/tests/gh16231.phpt Normal file
View File

@@ -0,0 +1,21 @@
--TEST--
GH-16231 (jdtounix argument overflow)
--EXTENSIONS--
calendar
--FILE--
<?php
try {
jdtounix(PHP_INT_MIN);
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
try {
jdtounix(240587);
} catch (\ValueError $e) {
echo $e->getMessage();
}
?>
--EXPECTF--
jday must be between 2440588 and %d
jday must be between 2440588 and %d