ICU-11793 Add validation check to len

X-SVN-Rev: 38080

diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp
index bdfd0c9a6d6590be1cfa9f4d465fe2c723f71ecf..32a06bf84fccd5dcf9a611a0d8fc562da7c5a962 100644 (file)
--- a/icu4c/source/common/uloc.cpp
+++ b/icu4c/source/common/uloc.cpp
@@ -2132,13 +2132,13 @@ uloc_getLCID(const char* localeID)
             len = uloc_getBaseName(localeID, tmpLocaleID,
                 sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - 1, &status);
 
-            if (U_SUCCESS(status)) {
+            if (U_SUCCESS(status) && len > 0) {
                 tmpLocaleID[len] = 0;
 
                 len = uloc_setKeywordValue("collation", collVal, tmpLocaleID,
                     sizeof(tmpLocaleID)/sizeof(tmpLocaleID[0]) - len - 1, &status);
 
-                if (U_SUCCESS(status)) {
+                if (U_SUCCESS(status) && len > 0) {
                     tmpLocaleID[len] = 0;
                     return uprv_convertToLCID(langID, tmpLocaleID, &status);
                 }