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-11-06 12:53:40 +00:00
parent 91eda57680 a0c7550886
commit 3942972bef
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/calendar/gregor.c
View File

@@ -148,11 +148,15 @@ void SdnToGregorian(
int dayOfYear;
if (sdn <= 0 ||
sdn > (LONG_MAX - 4 * GREGOR_SDN_OFFSET) / 4) {
sdn > (ZEND_LONG_MAX - 4 * GREGOR_SDN_OFFSET) / 4) {
goto fail;
}
temp = (sdn + GREGOR_SDN_OFFSET) * 4 - 1;
if (temp < 0 || (temp / DAYS_PER_400_YEARS) > INT_MAX) {
goto fail;
}
/* Calculate the century (year/100). */
century = temp / DAYS_PER_400_YEARS;

11
ext/calendar/tests/gh16235.phpt Normal file
View File

@@ -0,0 +1,11 @@
--TEST--
GH-16235 (jdtogregorian overflow on argument)
--EXTENSIONS--
calendar
--FILE--
<?php
jdtogregorian(536838867);
echo "DONE";
?>
--EXPECT--
DONE