From: Abhinav Gupta <mail@abhinavg.net>
Date: Mon, 7 Nov 2011 16:36:22 +0000 (+0000)
Subject: ICU-8854 Possible null pointer dereference.
X-Git-Tag: milestone-59-0-1~4359
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ec02005963f8d1e09ec54456b4cab112e739707;p=icu

ICU-8854 Possible null pointer dereference.

X-SVN-Rev: 30936
---

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java
index ddfa4d2254b..f79eecfab69 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java
@@ -351,7 +351,7 @@ public final class ZoneMeta {
      * the id itself. If the given tzid is not known, return null.
      * 
      * Note: This internal API supports all known system IDs and "Etc/Unknown" (which is
-     * NOT a sysmte ID).
+     * NOT a system ID).
      */
     public static String getCanonicalCLDRID(String tzid) {
         String canonical = CANONICAL_ID_CACHE.get(tzid);
@@ -377,9 +377,11 @@ public final class ZoneMeta {
                             ICUResourceBundle.ICU_BASE_NAME, "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
                     UResourceBundle typeAlias = keyTypeData.get("typeAlias");
                     UResourceBundle aliasesForKey = typeAlias.get("timezone");
-                    String cldrCanonical = aliasesForKey.getString(canonical.replace('/', ':'));
-                    if (cldrCanonical != null) {
-                        canonical = cldrCanonical;
+                    if (canonical != null) {
+                        String cldrCanonical = aliasesForKey.getString(canonical.replace('/', ':'));
+                        if (cldrCanonical != null) {
+                            canonical = cldrCanonical;
+                        }
                     }
                 } catch (MissingResourceException e) {
                     // fall through