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

ICU-21587 Fix memory bug w/ baseName

Browse source 
Edge cases not fixed in assign and move assign operator
while the locale is long and call setKeywordValue with incorrect
keyword/values.
This commit is contained in:
Frank Tang 2021-04-13 15:16:50 -07:00 • committed by Frank Yung-Fong Tang
parent 45b893c1f9
commit 2dc5bea906
3 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT {
if ((baseName != fullName) && (baseName != fullNameBuffer)) uprv_free(baseName);
if (fullName != fullNameBuffer) uprv_free(fullName);
if (other.fullName == other.fullNameBuffer) {
if (other.fullName == other.fullNameBuffer || other.baseName == other.fullNameBuffer) {
uprv_strcpy(fullNameBuffer, other.fullNameBuffer);
}
if (other.fullName == other.fullNameBuffer) {
fullName = fullNameBuffer;
} else {
fullName = other.fullName;
}
if (other.baseName == other.fullName) {
if (other.baseName == other.fullNameBuffer) {
baseName = fullNameBuffer;
} else if (other.baseName == other.fullName) {
baseName = fullName;
} else {
baseName = other.baseName;
@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const char* keywordValue, UErro
if (fullName != fullNameBuffer) {
// if full Name is already on the heap, need to free it.
uprv_free(fullName);
if (baseName == fullName) {
baseName = newFullName; // baseName should not point to freed memory.
}
}
fullName = newFullName;
status = U_ZERO_ERROR;

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

@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool exec, const char* &name, c
TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale);
TESTCASE_AUTO(TestCanonicalize);
TESTCASE_AUTO(TestLeak21419);
TESTCASE_AUTO(TestLongLocaleSetKeywordAssign);
TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign);
TESTCASE_AUTO_END;
}
@ -6520,6 +6522,30 @@ void LocaleTest::TestSetUnicodeKeywordValueInLongLocale() {
}
}
void LocaleTest::TestLongLocaleSetKeywordAssign() {
IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign");
// A long base name, with an illegal keyword and copy constructor
icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_"
"AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_"
"AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17_AAAAAA18");
Locale l2;
l.setUnicodeKeywordValue("co", "12", status); // Cause an error
status.reset();
l2 = l; // copy operator on such bogus locale.
}
void LocaleTest::TestLongLocaleSetKeywordMoveAssign() {
IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordMoveAssign");
// A long base name, with an illegal keyword and copy constructor
icu::Locale l("de_AAAAAAA1_AAAAAAA2_AAAAAAA3_AAAAAAA4_AAAAAAA5_AAAAAAA6_"
"AAAAAAA7_AAAAAAA8_AAAAAAA9_AAAAAA10_AAAAAA11_AAAAAA12_"
"AAAAAA13_AAAAAA14_AAAAAA15_AAAAAA16_AAAAAA17");
Locale l2;
l.setUnicodeKeywordValue("co", "12", status); // Cause an error
status.reset();
Locale l3 = std::move(l); // move assign
}
void LocaleTest::TestSetUnicodeKeywordValueNullInLongLocale() {
IcuTestErrorCode status(*this, "TestSetUnicodeKeywordValueNullInLongLocale");
const char *exts[] = {"cf", "cu", "em", "kk", "kr", "ks", "kv", "lb", "lw",

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

@ -156,6 +156,8 @@ public:
void TestSetUnicodeKeywordValueInLongLocale();
void TestSetUnicodeKeywordValueNullInLongLocale();
void TestLeak21419();
void TestLongLocaleSetKeywordAssign();
void TestLongLocaleSetKeywordMoveAssign();
private:
void _checklocs(const char* label,