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

ICU-21597 Fix Null-deref W in canonicalizeLocale

Browse source
This commit is contained in:
Frank Tang 2021-04-28 12:39:57 -07:00 • committed by Norbert Runge
parent 19c52a4fe3
commit b13be666cd
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/locid.cpp
View file

@ -1571,6 +1571,7 @@ AliasReplacer::replaceTransformedExtensions(
const char* tvalue = uprv_strchr(tkey, '-');
if (tvalue == nullptr) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return false;
}
const char* nextTKey = ultag_getTKeyStart(tvalue);
if (nextTKey != nullptr) {
@ -1591,8 +1592,11 @@ AliasReplacer::replaceTransformedExtensions(
}
const char* tfield = (const char*) tfields.elementAt(i);
const char* tvalue = uprv_strchr(tfield, '-');
if (tvalue == nullptr) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return false;
}
// Split the "tkey-tvalue" pair string so that we can canonicalize the tvalue.
U_ASSERT(tvalue != nullptr);
*((char*)tvalue++) = '\0'; // NULL terminate tkey
output.append(tfield, status).append('-', status);
const char* bcpTValue = ulocimp_toBcpType(tfield, tvalue, nullptr, nullptr);

9
icu4c/source/test/intltest/loctest.cpp
View file

@ -284,6 +284,7 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c
TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale);
TESTCASE_AUTO(TestCanonicalize);
TESTCASE_AUTO(TestLeak21419);
TESTCASE_AUTO(TestNullDereferenceWrite21597);
TESTCASE_AUTO(TestLongLocaleSetKeywordAssign);
TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign);
TESTCASE_AUTO_END;
@ -5030,7 +5031,6 @@ void LocaleTest::TestCanonicalize(void)
// alias of tvalue should be replaced
{ "en-t-m0-NaMeS", "en-t-m0-prprname" },
{ "en-t-s0-ascii-d0-NaMe", "en-t-d0-charname-s0-ascii" },
};
int32_t i;
for (i=0; i < UPRV_LENGTHOF(testCases); i++) {
@ -6586,3 +6586,10 @@ void LocaleTest::TestLeak21419() {
l.canonicalize(status);
status.expectErrorAndReset(U_ILLEGAL_ARGUMENT_ERROR);
}
void LocaleTest::TestNullDereferenceWrite21597() {
IcuTestErrorCode status(*this, "TestNullDereferenceWrite21597");
Locale l = Locale("zu-t-q5-X1-vKf-KK-Ks-cO--Kc");
l.canonicalize(status);
status.expectErrorAndReset(U_ILLEGAL_ARGUMENT_ERROR);
}

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

@ -156,6 +156,7 @@ public:
void TestSetUnicodeKeywordValueInLongLocale();
void TestSetUnicodeKeywordValueNullInLongLocale();
void TestLeak21419();
void TestNullDereferenceWrite21597();
void TestLongLocaleSetKeywordAssign();
void TestLongLocaleSetKeywordMoveAssign();