From 64064a7cf2ba8d20a92ee65dc3b77b9e1e7ef9b5 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Thu, 22 Dec 2011 15:42:45 +0000 Subject: [PATCH] ICU-8984 apply patch attached to ticket X-SVN-Rev: 31169 --- icu4c/source/common/uloc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp index 11a3a4f4887..247b15acac0 100644 --- a/icu4c/source/common/uloc.cpp +++ b/icu4c/source/common/uloc.cpp @@ -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.40.0