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

ICU-11532 Infinite loop while parsing an RBNF rule with plural format

Browse source 
X-SVN-Rev: 37105
This commit is contained in:
George Rhoten 2015-03-02 03:20:51 +00:00
parent 2b9fe640f1
commit 54930e302a
3 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/i18n/plurfmt.cpp
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2009-2014, International Business Machines Corporation and
* Copyright (C) 2009-2015, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -533,7 +533,7 @@ void PluralFormat::parseType(const UnicodeString& source, const NFRule *rbnfLeni
currMatchIndex = rbnfLenientScanner->findTextLenient(source, currArg, startingAt, &length);
}
else {
currMatchIndex = source.indexOf(currArg);
currMatchIndex = source.indexOf(currArg, startingAt);
}
if (currMatchIndex >= 0 && currMatchIndex >= matchedIndex && currArg.length() > matchedWord.length()) {
matchedIndex = currMatchIndex;

42
icu4c/source/test/intltest/itrbnf.cpp
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2014, International Business Machines Corporation and *
* Copyright (C) 1996-2015, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -66,6 +66,7 @@ void IntlTestRBNF::runIndexedTest(int32_t index, UBool exec, const char* &name,
TESTCASE(18, TestMultiplierSubstitution);
TESTCASE(19, TestSetDecimalFormatSymbols);
TESTCASE(20, TestPluralRules);
TESTCASE(21, TestMultiplePluralRules);
#else
TESTCASE(0, TestRBNFDisabled);
#endif
@ -341,6 +342,45 @@ IntlTestRBNF::TestAPI() {
delete formatter;
}
/**
* Perform a simple spot check on the parsing going into an infinite loop for alternate rules.
*/
void IntlTestRBNF::TestMultiplePluralRules() {
// This is trying to model the feminine form, but don't worry about the details too much.
// We're trying to test the plural rules where there are different prefixes.
UnicodeString rules("%spellout-cardinal-feminine-genitive:"
"0: zero;"
"1: ono;"
"1000: << $(cardinal,one{thousand}few{thousanF}other{thousanO})$[ >>];"
"%spellout-cardinal-feminine:"
"0: zero;"
"1: one;"
"1000: << $(cardinal,one{thousand}few{thousanF}other{thousanO})$[ >>];");
UErrorCode status = U_ZERO_ERROR;
UParseError pError;
RuleBasedNumberFormat formatter(rules, Locale("ru"), pError, status);
Formattable result;
UnicodeString resultStr;
FieldPosition pos;
formatter.parse(formatter.format(1000.0, resultStr, pos, status), result, status);
if (1000 != result.getLong() || resultStr != UNICODE_STRING_SIMPLE("one thousand")) {
errln("RuleBasedNumberFormat did not return the correct value. Got: %d", result.getLong());
errln(resultStr);
}
resultStr.remove();
formatter.parse(formatter.format(1000.0, UnicodeString("%spellout-cardinal-feminine-genitive"), resultStr, pos, status), result, status);
if (1000 != result.getLong() || resultStr != UNICODE_STRING_SIMPLE("ono thousand")) {
errln("RuleBasedNumberFormat(cardinal-feminine-genitive) did not return the correct value. Got: %d", result.getLong());
errln(resultStr);
}
resultStr.remove();
formatter.parse(formatter.format(1000.0, UnicodeString("%spellout-cardinal-feminine"), resultStr, pos, status), result, status);
if (1000 != result.getLong() || resultStr != UNICODE_STRING_SIMPLE("one thousand")) {
errln("RuleBasedNumberFormat(spellout-cardinal-feminine) did not return the correct value. Got: %d", result.getLong());
errln(resultStr);
}
}
void IntlTestRBNF::TestFractionalRuleSet()
{
UnicodeString fracRules(

4
icu4c/source/test/intltest/itrbnf.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2014, International Business Machines Corporation and *
* Copyright (C) 1996-2015, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -28,6 +28,8 @@ class IntlTestRBNF : public IntlTest {
*/
virtual void TestAPI();
void TestMultiplePluralRules();
/**
* Perform a simple spot check on the FractionalRuleSet logic
*/