organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-04 21:15:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-22962 fix int32_t overflow inside handleComputeJulianDay

Browse source 
test
This commit is contained in:
Frank Tang 2024-11-08 00:13:30 -08:00 • committed by Frank Yung-Fong Tang
parent fbfbe6c7aa
commit 44ea9278b9
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
icu4c/source/i18n/calendar.cpp
View file

@ -3609,7 +3609,12 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField, UErrorCo
#endif
if(julianDay+testDate > nextJulianDay) { // is it past Dec 31? (nextJulianDay is day BEFORE year+1's Jan 1)
// Fire up the calculating engines.. retry YWOY = (year-1)
julianDay = handleComputeMonthStart(year-1, 0, false, status); // jd before Jan 1 of previous year
int32_t prevYear;
if (uprv_add32_overflow(year, -1, &prevYear)) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
julianDay = handleComputeMonthStart(prevYear, 0, false, status); // jd before Jan 1 of previous year
if (U_FAILURE(status)) {
return 0;
}

12
icu4c/source/test/intltest/caltest.cpp
View file

@ -207,6 +207,7 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
TESTCASE_AUTO(Test22633HebrewLargeNegativeDay);
TESTCASE_AUTO(Test22730JapaneseOverflow);
TESTCASE_AUTO(Test22730CopticOverflow);
TESTCASE_AUTO(Test22962ComputeJulianDayOverflow);
TESTCASE_AUTO(TestAddOverflow);
@ -5898,6 +5899,17 @@ void CalendarTest::Test22730CopticOverflow() {
assertEquals("status return without overflow", status, U_ILLEGAL_ARGUMENT_ERROR);
}
void CalendarTest::Test22962ComputeJulianDayOverflow() {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<Calendar> calendar(
Calendar::createInstance(Locale("nds-NL-u-ca-islamic-umalqura"), status),
status);
calendar->clear();
calendar->set(UCAL_YEAR, -2147483648);
calendar->set(UCAL_WEEK_OF_YEAR, 33816240);
calendar->get(UCAL_ERA, status);
assertEquals("status return without overflow", status, U_ILLEGAL_ARGUMENT_ERROR);
}
void CalendarTest::TestAddOverflow() {
UErrorCode status = U_ZERO_ERROR;

1
icu4c/source/test/intltest/caltest.h
View file

@ -348,6 +348,7 @@ public: // package
void Test22633RollTwiceGetTimeOverflow();
void Test22730JapaneseOverflow();
void Test22730CopticOverflow();
void Test22962ComputeJulianDayOverflow();
void Test22750Roll();