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

ICU-20370 Fix error checking in uloc_getLCID function.

Browse source
This commit is contained in:
Jeff Genovy 2019-01-21 16:52:15 -08:00
parent e7d36adf17
commit 85600f2639
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/uloc.cpp
View file

@ -2191,7 +2191,7 @@ uloc_getLCID(const char* localeID)
}
uloc_getLanguage(localeID, langID, sizeof(langID), &status);
if (U_FAILURE(status)) {
if (U_FAILURE(status) || status == U_STRING_NOT_TERMINATED_WARNING) {
return 0;
}

12
icu4c/source/test/cintltst/cloctst.c
View file

@ -52,6 +52,7 @@ static void TestUnicodeDefines(void);
static void TestIsRightToLeft(void);
static void TestBadLocaleIDs(void);
static void TestBug20370(void);
void PrintDataTable();
@ -266,6 +267,7 @@ void addLocaleTest(TestNode** root)
TESTCASE(TestToUnicodeLocaleType);
TESTCASE(TestToLegacyType);
TESTCASE(TestBadLocaleIDs);
TESTCASE(TestBug20370);
}
@ -6498,3 +6500,13 @@ static void TestBadLocaleIDs() {
}
}
}
// Test case for ICU-20370.
// The issue shows as an Addresss Sanitizer failure.
static void TestBug20370() {
const char *localeID = "x-privatebutreallylongtagfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar";
uint32_t lcid = uloc_getLCID(localeID);
if (lcid != 0) {
log_err("FAIL: Expected LCID value of 0 for invalid localeID input.");
}
}