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

ICU-13094 Handle empty language subtag in parseTagString().

Browse source 
X-SVN-Rev: 40076
This commit is contained in:
Fredrik Roubert 2017-04-26 20:12:01 +00:00
parent b1880dfdb7
commit a7123ed229
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/loclikely.cpp
View file

@ -511,7 +511,7 @@ parseTagString(
unknownLanguage);
*langLength = (int32_t)uprv_strlen(lang);
}
else if (_isIDSeparator(*position)) {
if (_isIDSeparator(*position)) {
++position;
}

20
icu4c/source/test/cintltst/cloctst.c
View file

@ -3474,6 +3474,21 @@ const char* const basic_maximize_data[][2] = {
}, {
"de_Latn_DE_u_co_phonebk",
"de_Latn_DE_U_CO_PHONEBK"
}, {
"_Arab@em=emoji",
"ar_Arab_EG@em=emoji"
}, {
"_Latn@em=emoji",
"en_Latn_US@em=emoji"
}, {
"_Latn_DE@em=emoji",
"de_Latn_DE@em=emoji"
}, {
"_Zzzz_DE@em=emoji",
"de_Latn_DE@em=emoji"
}, {
"_DE@em=emoji",
"de_Latn_DE@em=emoji"
}
};
@ -6022,6 +6037,11 @@ static const struct {
{"en-u-baz-ca-islamic-civil", "en@attribute=baz;calendar=islamic-civil", FULL_LENGTH},
{"en-a-bar-u-ca-islamic-civil-x-u-foo", "en@a=bar;calendar=islamic-civil;x=u-foo", FULL_LENGTH},
{"en-a-bar-u-baz-ca-islamic-civil-x-u-foo", "en@a=bar;attribute=baz;calendar=islamic-civil;x=u-foo", FULL_LENGTH},
{"und-Arab-u-em-emoji", "_Arab@em=emoji", FULL_LENGTH},
{"und-Latn-u-em-emoji", "_Latn@em=emoji", FULL_LENGTH},
{"und-Latn-DE-u-em-emoji", "_Latn_DE@em=emoji", FULL_LENGTH},
{"und-Zzzz-DE-u-em-emoji", "_Zzzz_DE@em=emoji", FULL_LENGTH},
{"und-DE-u-em-emoji", "_DE@em=emoji", FULL_LENGTH},
{NULL, NULL, 0}
};