archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/calendar: jewishtojd overflow on year argument.

Browse source 
Upper limit set to the 7th millenium (Messianic Age) in the jewish calendar,
 around 2239 year in the gregorian calendar.

close GH-18849
This commit is contained in:
David Carlier 2025-06-14 11:11:38 +01:00
parent a5f21ca700
commit 2ccd2b016d
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
5 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.3.24
- Calendar:
. Fixed jewishtojd overflow on year argument. (David Carlier)
- Core:
. Fixed bug GH-18833 (Use after free with weakmaps dependent on destruction
order). (Daniil Gentili)

5
ext/calendar/calendar.c
View file

@ -490,6 +490,11 @@ PHP_FUNCTION(jewishtojd)
RETURN_THROWS();
}
if (ZEND_LONG_EXCEEDS_INT(year)) {
zend_argument_value_error(3, "must be between %d and %d", INT_MIN, INT_MAX);
RETURN_THROWS();
}
RETURN_LONG(JewishToSdn(year, month, day));
}
/* }}} */

2
ext/calendar/jewish.c
View file

@ -714,7 +714,7 @@ zend_long JewishToSdn(
int yearLength;
int lengthOfAdarIAndII;
if (year <= 0 || day <= 0 || day > 30) {
if (year <= 0 || year >= 6000 || day <= 0 || day > 30) {
return (0);
}
switch (month) {

11
ext/calendar/tests/gh16234_2.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
GH-16234 jewishtojd overflow on year argument
--EXTENSIONS--
calendar
--FILE--
<?php
jewishtojd(10, 6, 2147483647);
echo "DONE";
?>
--EXPECTF--
DONE

21
ext/calendar/tests/gh16234_2_64.phpt Normal file
View file

@ -0,0 +1,21 @@
--TEST--
GH-16234 jewishtojd overflow on year argument
--EXTENSIONS--
calendar
--SKIPIF--
<?php
if (PHP_INT_SIZE == 4) {
die("skip this test is for 64bit platform only");
}
?>
--FILE--
<?php
try {
jewishtojd(10, 6, PHP_INT_MIN);
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
jewishtojd(): Argument #3 ($year) must be between %i and %d