Update ICU to 54.1 step 1

source/i18n/zonemeta.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2007-2013, International Business Machines Corporation and
+* Copyright (C) 2007-2014, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "zonemeta.h"
 
@@ skipping 214 matching lines @@
     ucln_i18n_registerCleanup(UCLN_I18N_ZONEMETA, zoneMeta_cleanup);
 }
 
 
 const UChar* U_EXPORT2
 ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) {
     if (U_FAILURE(status)) {
         return NULL;
     }
 
-    int32_t len = tzid.length();
-    if (len > ZID_KEY_MAX) {
+    if (tzid.isBogus() || tzid.length() > ZID_KEY_MAX) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return NULL;
     }
 
     // Checking the cached results
     umtx_initOnce(gCanonicalIDCacheInitOnce, &initCanonicalIDCache, status);
     if (U_FAILURE(status)) {
         return NULL;
     }
 
@@ skipping 11 matching lines @@
     }
     umtx_unlock(&gZoneMetaLock);
 
     if (canonicalID != NULL) {
         return canonicalID;
     }
 
     // If not, resolve CLDR canonical ID with resource data
     UBool isInputCanonical = FALSE;
     char id[ZID_KEY_MAX + 1];
-    const UChar* idChars = tzid.getBuffer();
-
-    u_UCharsToChars(idChars,id,len);
-    id[len] = (char) 0; // Make sure it is null terminated.
+    tzid.extract(0, 0x7fffffff, id, UPRV_LENGTHOF(id), US_INV);
 
     // replace '/' with ':'
     char *p = id;
     while (*p++) {
         if (*p == '/') {
             *p = ':';
         }
     }
 
     UResourceBundle *top = ures_openDirect(NULL, gKeyTypeData, &tmpStatus);
@@ skipping 17 matching lines @@
             // canonical map found
             canonicalID = canonical;
         }
 
         if (canonicalID == NULL) {
             // Dereference the input ID using the tz data
             const UChar *derefer = TimeZone::dereferOlsonLink(tzid);
             if (derefer == NULL) {
                 status = U_ILLEGAL_ARGUMENT_ERROR;
             } else {
-                len = u_strlen(derefer);
+                int32_t len = u_strlen(derefer);
                 u_UCharsToChars(derefer,id,len);
                 id[len] = (char) 0; // Make sure it is null terminated.
 
                 // replace '/' with ':'
                 char *p = id;
                 while (*p++) {
                     if (*p == '/') {
                         *p = ':';
                     }
                 }
@@ skipping 387 matching lines @@
 }
 
 UnicodeString& U_EXPORT2
 ZoneMeta::getZoneIdByMetazone(const UnicodeString &mzid, const UnicodeString &region, UnicodeString &result) {
     UErrorCode status = U_ZERO_ERROR;
     const UChar *tzid = NULL;
     int32_t tzidLen = 0;
     char keyBuf[ZID_KEY_MAX + 1];
     int32_t keyLen = 0;
 
-    if (mzid.length() > ZID_KEY_MAX) {
+    if (mzid.isBogus() || mzid.length() > ZID_KEY_MAX) {
         result.setToBogus();
         return result;
     }
 
     keyLen = mzid.extract(0, mzid.length(), keyBuf, ZID_KEY_MAX + 1, US_INV);
     keyBuf[keyLen] = 0;
 
     UResourceBundle *rb = ures_openDirect(NULL, gMetaZones, &status);
     ures_getByKey(rb, gMapTimezonesTag, rb, &status);
     ures_getByKey(rb, keyBuf, rb, &status);
@@ skipping 199 matching lines @@
     ures_getByKey(rb, gTimezoneTag, rb, &status);
     shortID = ures_getStringByKey(rb, tzidKey, NULL, &status);
     ures_close(rb);
 
     return shortID;
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */