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

ICU-22521 Return U_INTERNAL_PROGRAM_ERROR instead of % 0

Browse source 
When the gap is 0, return status as U_INTERNAL_PROGRAM_ERROR
and avoid the operation of "% gap"
This commit is contained in:
Frank Tang 2023-09-28 00:26:31 -07:00 • committed by Frank Yung-Fong Tang
parent acfe1c299b
commit 07137b64e4
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1927,6 +1927,10 @@ void Calendar::roll(UCalendarDateFields field, int32_t amount, UErrorCode& statu
// Now roll between start and (limit - 1).
int32_t gap = limit - start;
if (gap == 0) {
status = U_INTERNAL_PROGRAM_ERROR;
return;
}
int32_t day_of_month = (internalGet(UCAL_DAY_OF_MONTH) + amount*7 -
start) % gap;
if (day_of_month < 0) day_of_month += gap;
@ -1985,6 +1989,10 @@ void Calendar::roll(UCalendarDateFields field, int32_t amount, UErrorCode& statu
// Now roll between start and (limit - 1).
int32_t gap = limit - start;
if (gap == 0) {
status = U_INTERNAL_PROGRAM_ERROR;
return;
}
int32_t day_of_year = (internalGet(UCAL_DAY_OF_YEAR) + amount*7 -
start) % gap;
if (day_of_year < 0) day_of_year += gap;

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

@ -188,6 +188,7 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name,
TESTCASE_AUTO(TestFWWithISO8601);
TESTCASE_AUTO(TestDangiOverflowIsLeapMonthBetween22507);
TESTCASE_AUTO(TestRollWeekOfYear);
TESTCASE_AUTO_END;
}
@ -5540,6 +5541,17 @@ void CalendarTest::TestFWWithISO8601() {
assertEquals(msg.c_str(), i, cal->getFirstDayOfWeek());
}
}
void CalendarTest::TestRollWeekOfYear() {
UErrorCode status = U_ZERO_ERROR;
Locale l("zh_TW@calendar=chinese");
LocalPointer<Calendar> cal(Calendar::createInstance(l, status), status);
cal->set(UCAL_EXTENDED_YEAR, -1107626);
cal->set(UCAL_MONTH, UCAL_JANUARY);
cal->set(UCAL_DATE, 1);
cal->roll(UCAL_WEEK_OF_YEAR, 0x7fffff, status);
U_ASSERT(U_SUCCESS(status));
cal->roll(UCAL_WEEK_OF_YEAR, 1, status);
}
#endif /* #if !UCONFIG_NO_FORMATTING */
//eof

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

@ -332,6 +332,7 @@ public: // package
void TestDangiOverflowIsLeapMonthBetween22507();
void TestFWWithISO8601();
void TestRollWeekOfYear();
void RunChineseCalendarInTemporalLeapYearTest(Calendar* cal);
void RunIslamicCalendarInTemporalLeapYearTest(Calendar* cal);