From b25be06635768807f8f693286fa73bb2297bb06c Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Thu, 8 Mar 2012 22:16:41 +0000
Subject: [PATCH] ICU-461.18.tar.gz

---
 icuSources/common/uloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
             }
         }
-- 
2.47.2