organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8892 merge for changeset 31169

Browse source 
X-SVN-Rev: 32360
This commit is contained in:
Debabrata Sengupta 2012-09-07 21:17:41 +00:00
parent 2b01ec67b2
commit 89b028acb0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/common/uloc.c
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2011, International Business Machines
* Copyright (C) 1997-2012, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -1797,7 +1797,7 @@ _canonicalize(const char* localeID,
int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
len -= variantLen;
if (variantLen > 0) {
if (name[len-1] == '_') { /* delete trailing '_' */
if (len>0 && name[len-1] == '_') { /* delete trailing '_' */
--len;
}
addKeyword = VARIANT_MAP[j].keyword;
@ -1805,7 +1805,7 @@ _canonicalize(const char* localeID,
break;
}
}
if (name[len-1] == '_') { /* delete trailing '_' */
if (len>0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
--len;
}
}