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

ICU-22414 Fix bogus locale in collation res fallback

Browse source
This commit is contained in:
Frank Tang 2023-06-13 20:27:39 -07:00 • committed by Frank Yung-Fong Tang
parent e567b50df8
commit 9411a940ea
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/i18n/ucol_res.cpp
View file

@ -174,10 +174,20 @@ CollationLoader::CollationLoader(const CollationCacheEntry *re, const Locale &re
defaultType[0] = 0;
if(U_FAILURE(errorCode)) { return; }
if (locale.isBogus()) {
errorCode = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
// Canonicalize the locale ID: Ignore all irrelevant keywords.
const char *baseName = locale.getBaseName();
if(uprv_strcmp(locale.getName(), baseName) != 0) {
locale = Locale(baseName);
// Due to ICU-22416, we may have bogus locale constructed from
// a string of getBaseName().
if (locale.isBogus()) {
errorCode = U_ILLEGAL_ARGUMENT_ERROR;
return;
}
// Fetch the collation type from the locale ID.
int32_t typeLength = requested.getKeywordValue("collation",

18
icu4c/source/test/intltest/collationtest.cpp
View file

@ -80,6 +80,7 @@ public:
void TestDataDriven();
void TestLongLocale();
void TestBuilderContextsOverflow();
void TestHang22414();
private:
void checkFCD(const char *name, CollationIterator &ci, CodePointIterator &cpi);
@ -152,6 +153,7 @@ void CollationTest::runIndexedTest(int32_t index, UBool exec, const char *&name,
TESTCASE_AUTO(TestDataDriven);
TESTCASE_AUTO(TestLongLocale);
TESTCASE_AUTO(TestBuilderContextsOverflow);
TESTCASE_AUTO(TestHang22414);
TESTCASE_AUTO_END;
}
@ -1864,6 +1866,22 @@ void CollationTest::TestLongLocale() {
LocalPointer<Collator> coll(Collator::createInstance(longLocale, errorCode));
}
void CollationTest::TestHang22414() {
IcuTestErrorCode errorCode(*this, "TestHang22414");
const char* cases[] = {
"en", // just make sure the code work.
// The following hang before fixing ICU-22414
"sr-Latn-TH-t-su-BM-u-co-private-unihan-x-lvariant-zxsuhc-vss-vjf-0-kn-"
"uaktmtca-uce66u-vtcb1ik-ubsuuuk8-u3iucls-ue38925l-vau30i-u6uccttg-"
"u1iuylik-u-ueein-zzzz",
};
for(int32_t i = 0; i < UPRV_LENGTHOF(cases); i ++) {
icu::Locale l = icu::Locale::forLanguageTag(cases[i], errorCode);
// Make sure the following won't hang.
LocalPointer<Collator> coll(Collator::createInstance(l, errorCode));
errorCode.reset();
}
}
void CollationTest::TestBuilderContextsOverflow() {
IcuTestErrorCode errorCode(*this, "TestBuilderContextsOverflow");
// ICU-20715: Bad memory access in what looks like a bogus CharsTrie after