ICU 56 update step 1

source/common/uloc_tag.c

 /*
 **********************************************************************
-*   Copyright (C) 2009-2014, International Business Machines
+*   Copyright (C) 2009-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 
 #include "unicode/utypes.h"
 #include "unicode/ures.h"
 #include "unicode/putil.h"
 #include "unicode/uloc.h"
 #include "ustr_imp.h"
 #include "cmemory.h"
@@ skipping 1299 matching lines @@
         const char *pBcpKey = NULL;     /* u extenstion key subtag */
         const char *pBcpType = NULL;    /* beginning of u extension type subtag(s) */
         int32_t bcpKeyLen = 0;
         int32_t bcpTypeLen = 0;
         UBool isDone = FALSE;
 
         pTag = pKwds;
         /* BCP47 representation of LDML key/type pairs */
         while (!isDone) {
             const char *pNextBcpKey = NULL;
-            int32_t nextBcpKeyLen;
+            int32_t nextBcpKeyLen = 0;
             UBool emitKeyword = FALSE;
 
             if (*pTag) {
                 /* locate next separator char */
                 for (len = 0; *(pTag + len) && *(pTag + len) != SEP; len++);
 
                 if (ultag_isUnicodeLocaleKey(pTag, len)) {
                     if (pBcpKey) {
                         emitKeyword = TRUE;
                         pNextBcpKey = pTag;
@@ skipping 492 matching lines @@
         if (uprv_stricmp(GRANDFATHERED[i], tagBuf) == 0) {
             int32_t newTagLength;
 
             grandfatheredLen = tagLen;  /* back up for output parsedLen */
             newTagLength = uprv_strlen(GRANDFATHERED[i+1]);
             if (tagLen < newTagLength) {
                 uprv_free(tagBuf);
                 tagBuf = (char*)uprv_malloc(newTagLength + 1);
                 if (tagBuf == NULL) {
                     *status = U_MEMORY_ALLOCATION_ERROR;
+                    ultag_close(t);
                     return NULL;
                 }
                 t->buf = tagBuf;
                 tagLen = newTagLength;
             }
             uprv_strcpy(t->buf, GRANDFATHERED[i + 1]);
             break;
         }
     }
 
@@ skipping 276 matching lines @@
         }
     }
 
     if (parsedLen != NULL) {
         *parsedLen = (grandfatheredLen > 0) ? grandfatheredLen : (int32_t)(pLastGoodPosition - t->buf);
     }
 
     return t;
 
 error:
-    uprv_free(t);
+    ultag_close(t);
     return NULL;
 }
 
 static void
 ultag_close(ULanguageTag* langtag) {
 
     if (langtag == NULL) {
         return;
     }
 
@@ skipping 358 matching lines @@
         }
         len = _appendKeywords(lt, localeID + reslen, localeIDCapacity - reslen, status);
         reslen += len;
     }
 
     ultag_close(lt);
     return u_terminateChars(localeID, localeIDCapacity, reslen, status);
 }