X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/f3c0d7a59d99c2a94c6b8822291f0e42be3773c9..4f1e1a09ce4daed860e35d359ce2fceccb0764e8:/icuSources/i18n/zonemeta.cpp?ds=sidebyside

diff --git a/icuSources/i18n/zonemeta.cpp b/icuSources/i18n/zonemeta.cpp
index 84a96578..02562048 100644
--- a/icuSources/i18n/zonemeta.cpp
+++ b/icuSources/i18n/zonemeta.cpp
@@ -690,7 +690,7 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) {
                     mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status);
                     if (U_FAILURE(status)) {
                         delete mzMappings;
-                        deleteOlsonToMetaMappingEntry(entry);
+                        mzMappings = NULL;
                         uprv_free(entry);
                         break;
                     }
@@ -792,7 +792,7 @@ static void U_CALLCONV initAvailableMetaZoneIDs () {
             break;
         }
         const char *mzID = ures_getKey(&res);
-        int32_t len = uprv_strlen(mzID);
+        int32_t len = static_cast<int32_t>(uprv_strlen(mzID));
         UChar *uMzID = (UChar*)uprv_malloc(sizeof(UChar) * (len + 1));
         if (uMzID == NULL) {
             status = U_MEMORY_ALLOCATION_ERROR;