ICU upgrade to 54.1 step 2

source/common/locid.cpp

 /*
  **********************************************************************
  *   Copyright (C) 1997-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
 *
 * File locid.cpp
 *
 * Created by: Richard Gillam
 *
@@ skipping 491 matching lines @@
         UErrorCode err;
 
         if(localeID == NULL) {
             // not an error, just set the default locale
             return *this = getDefault();
         }
 
         /* preset all fields to empty */
         language[0] = script[0] = country[0] = 0;
 
+        // Need to reset baseName. Otherwise, when a Locale object created with
+        // the default constructor is changed with setFromPOSIXID() later
+        // (e.g. locales obtained with getAvailableLocales()),
+        // baseName will be still that of the default locale instead of one
+        // corresponding to localeID.
+        baseName = NULL;
+
         // "canonicalize" the locale ID to ICU/Java format
         err = U_ZERO_ERROR;
         length = canonicalize ?
             uloc_canonicalize(localeID, fullName, sizeof(fullNameBuffer), &err) :
             uloc_getName(localeID, fullName, sizeof(fullNameBuffer), &err);
 
         if(err == U_BUFFER_OVERFLOW_ERROR || length >= (int32_t)sizeof(fullNameBuffer)) {
             /*Go to heap for the fullName if necessary*/
             fullName = (char *)uprv_malloc(sizeof(char)*(length + 1));
             if(fullName == 0) {
@@ skipping 493 matching lines @@
         // the length of the baseName.  Patch around this for now.
         if (variantBegin == (int32_t)uprv_strlen(fullName)) {
           ((Locale*)this)->variantBegin = baseNameSize;
         }
     }
     return baseName;
 }
 
 //eof
 U_NAMESPACE_END