From c2fbe47c86d4e4570ed4d219afee652166b7dcb8 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Mon, 6 Oct 2003 21:13:54 +0000 Subject: [PATCH] ICU-2942 Don't go off the end of the string. X-SVN-Rev: 13325 --- icu4c/source/common/uloc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/icu4c/source/common/uloc.c b/icu4c/source/common/uloc.c index 9bb795285e5..13e9425bd95 100644 --- a/icu4c/source/common/uloc.c +++ b/icu4c/source/common/uloc.c @@ -766,10 +766,12 @@ uloc_getVariant(const char* localeID, localeID = scriptID; } /* Skip the Country */ - _getCountry(localeID+1, NULL, 0, &localeID); - if(_isIDSeparator(*localeID)) { - haveVariant=TRUE; - i=_getVariant(localeID+1, *localeID, variant, variantCapacity); + if (_isIDSeparator(*localeID)) { + _getCountry(localeID+1, NULL, 0, &localeID); + if(_isIDSeparator(*localeID)) { + haveVariant=TRUE; + i=_getVariant(localeID+1, *localeID, variant, variantCapacity); + } } }