organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-11793 Add validation check to len

Browse source 
X-SVN-Rev: 38080
This commit is contained in:
Michael Ow 2015-10-28 16:30:28 +00:00
parent 9409eecc4c
commit 385c8dd53d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/uloc.cpp
View file

@ -2132,13 +2132,13 @@ uloc_getLCID(const char* localeID)
len = uloc_getBaseName(localeID, tmpLocaleID,
sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - 1, &status);
if (U_SUCCESS(status)) {
if (U_SUCCESS(status) && len > 0) {
tmpLocaleID[len] = 0;
len = uloc_setKeywordValue("collation", collVal, tmpLocaleID,
sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - len - 1, &status);
if (U_SUCCESS(status)) {
if (U_SUCCESS(status) && len > 0) {
tmpLocaleID[len] = 0;
return uprv_convertToLCID(langID, tmpLocaleID, &status);
}