From: Apple <opensource@apple.com>
Date: Thu, 8 Mar 2012 22:16:41 +0000 (+0000)
Subject: ICU-461.18.tar.gz
X-Git-Tag: mac-os-x-1075^0
X-Git-Url: https://git.saurik.com/apple/icu.git/commitdiff_plain/b25be06635768807f8f693286fa73bb2297bb06c

ICU-461.18.tar.gz
---

diff --git a/icuSources/common/uloc.c b/icuSources/common/uloc.c
index 64465032..aad031e5 100644
--- a/icuSources/common/uloc.c
+++ b/icuSources/common/uloc.c
@@ -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;
             }
         }