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-22626 Fix leakage when 2 '=' in PluralRules

Browse source 
See #2782
This commit is contained in:
Frank Tang 2024-01-11 23:14:27 +00:00 • committed by Frank Yung-Fong Tang
parent dc7014fda6
commit 509405c9f2
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
icu4c/source/i18n/plurrule.cpp
View file

@ -656,6 +656,11 @@ PluralRuleParser::parse(const UnicodeString& ruleData, PluralRules *prules, UErr
case tEqual:
{
U_ASSERT(curAndConstraint != nullptr);
if (curAndConstraint->rangeList != nullptr) {
// Already get a '='.
status = U_UNEXPECTED_TOKEN;
break;
}
LocalPointer<UVector32> newRangeList(new UVector32(status), status);
if (U_FAILURE(status)) {
break;

11
icu4c/source/test/intltest/plurults.cpp
View file

@ -69,6 +69,7 @@ void PluralRulesTest::runIndexedTest( int32_t index, UBool exec, const char* &na
TESTCASE_AUTO(testFixedDecimal);
TESTCASE_AUTO(testSelectTrailingZeros);
TESTCASE_AUTO(testLocaleExtension);
TESTCASE_AUTO(testDoubleEqualSign);
TESTCASE_AUTO_END;
}
@ -1638,6 +1639,16 @@ void PluralRulesTest::compareLocaleResults(const char* loc1, const char* loc2, c
}
}
void PluralRulesTest::testDoubleEqualSign() {
IcuTestErrorCode errorCode(*this, "testDoubleEqualSign");
// ICU-22626
// Two '=' in the rul should not leak.
LocalPointer<PluralRules> rules(
PluralRules::createRules(u"e:c=2=", errorCode), errorCode);
errorCode.expectErrorAndReset(U_UNEXPECTED_TOKEN);
}
void PluralRulesTest::testLocaleExtension() {
IcuTestErrorCode errorCode(*this, "testLocaleExtension");
LocalPointer<PluralRules> rules(PluralRules::forLocale("pt@calendar=gregorian", errorCode));

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

@ -50,6 +50,7 @@ private:
void testFixedDecimal();
void testSelectTrailingZeros();
void testLocaleExtension();
void testDoubleEqualSign();
void assertRuleValue(const UnicodeString& rule, double expected);
void assertRuleKeyValue(const UnicodeString& rule, const UnicodeString& key,