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

ICU-22962 Fix int overflow in Calendar::handleComputeJulianDay

Browse source
This commit is contained in:
Frank Tang 2024-12-19 16:26:45 -08:00 • committed by Frank Yung-Fong Tang
parent 7d60bb844e
commit 4c9ef1a31b
3 changed files with 21 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

@ -3607,7 +3607,12 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField, UErrorCo
fprintf(stderr, "%s:%d - y=%d, y-1=%d doy%d, njd%d (C.F. %d)\n",
__FILE__, __LINE__, year, year-1, testDate, julianDay+testDate, nextJulianDay);
#endif
if(julianDay+testDate > nextJulianDay) { // is it past Dec 31? (nextJulianDay is day BEFORE year+1's Jan 1)
if (uprv_add32_overflow(julianDay, testDate, &testDate)) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
if(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)
int32_t prevYear;
if (uprv_add32_overflow(year, -1, &prevYear)) {

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

@ -193,6 +193,7 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
TESTCASE_AUTO(Test22633ChineseOverflow);
TESTCASE_AUTO(Test22962ChineseOverflow);
TESTCASE_AUTO(Test22962BuddhistOverflow);
TESTCASE_AUTO(Test22633IndianOverflow);
TESTCASE_AUTO(Test22633IslamicUmalquraOverflow);
TESTCASE_AUTO(Test22633PersianOverflow);
@ -5665,6 +5666,19 @@ void CalendarTest::Test22633ChineseOverflow() {
assertTrue("Should return falure", U_FAILURE(status));
}
void CalendarTest::Test22962BuddhistOverflow() {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<Calendar> cal(Calendar::createInstance(Locale("en@calendar=uddhist"), status), status);
U_ASSERT(U_SUCCESS(status));
cal->clear();
cal->set(UCAL_WEEK_OF_YEAR, 1666136);
cal->set(UCAL_YEAR, -1887379272);
cal->fieldDifference(
261830011167902373443927125260580558779842815957727840993886210772873194951140935848493861585917165011373697198856398176256.000000,
UCAL_YEAR_WOY, status);
assertTrue("Should return falure", U_FAILURE(status));
}
void CalendarTest::Test22962ChineseOverflow() {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<Calendar> cal(Calendar::createInstance(Locale("en@calendar=chinese"), status), status);

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

@ -336,6 +336,7 @@ public: // package
void TestRollWeekOfYear();
void Test22633ChineseOverflow();
void Test22962ChineseOverflow();
void Test22962BuddhistOverflow();
void Test22633IndianOverflow();
void Test22633IslamicUmalquraOverflow();
void Test22633PersianOverflow();