organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-20680 Add comments about UPRV_UNREACHABLE to u_UCharsToChars and CEIBuffer::get[Previous].

Browse source
This commit is contained in:
Jeff Genovy 2019-08-28 12:19:32 -07:00
parent ed99298431
commit b702db31df
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3545,6 +3545,10 @@ const CEI *CEIBuffer::get(int32_t index) {
// that is allowed.
if (index != limitIx) {
U_ASSERT(FALSE);
// TODO: In ICU 64 the above assert was changed to use UPRV_UNREACHABLE instead
// which unconditionally calls abort(). However, there were cases where this was
// being hit. This change is reverted for now, restoring the existing behavior.
// ICU-20792 tracks the follow-up work/further investigation on this.
return NULL;
}
@ -3583,6 +3587,10 @@ const CEI *CEIBuffer::getPrevious(int32_t index) {
// that is allowed.
if (index != limitIx) {
U_ASSERT(FALSE);
// TODO: In ICU 64 the above assert was changed to use UPRV_UNREACHABLE instead
// which unconditionally calls abort(). However, there were cases where this was
// being hit. This change is reverted for now, restoring the existing behavior.
// ICU-20792 tracks the follow-up work/further investigation on this.
return NULL;
}

15
icu4c/source/test/cintltst/ccaltst.c
View file

@ -2403,6 +2403,11 @@ static const UChar tzTronto[] = /* America/Toronto */
static const UChar sBogus[] = /* Bogus */
{0x42,0x6F,0x67,0x75,0x73,0x00};
#ifndef U_DEBUG
static const UChar sBogusWithVariantCharacters[] = /* Bogus with Variant characters: Hèℓℓô Wôřℓδ */
{0x48,0xE8,0x2113,0x2113,0xF4,0x20,0x57,0xF4,0x159,0x2113,0x3B4,0x00};
#endif
void TestGetWindowsTimeZoneID() {
UErrorCode status;
UChar winID[64];
@ -2469,7 +2474,6 @@ void TestGetTimeZoneIDByWindowsID() {
log_err("FAIL: TZ ID for Eastern Standard Time - CA\n");
}
}
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(sBogus, -1, NULL, tzID, UPRV_LENGTHOF(tzID), &status);
@ -2479,6 +2483,15 @@ void TestGetTimeZoneIDByWindowsID() {
log_err("FAIL: TZ ID for Bogus\n");
}
}
#ifndef U_DEBUG
// This test is only for release mode because it will cause an assertion failure in debug builds.
// We don't check the API result for errors as the only purpose of this test is to ensure that
// input variant characters don't cause abort() to be called and/or that ICU doesn't crash.
{
status = U_ZERO_ERROR;
len = ucal_getTimeZoneIDForWindowsID(sBogusWithVariantCharacters, -1, NULL, tzID, UPRV_LENGTHOF(tzID), &status);
}
#endif
}
// The following currently assumes that Reiwa is the last known/valid era.