commit e387c69929ca8efd74b18c003818eaf1aa72796e
author Yoshito Umaoka <y.umaoka@gmail.com> Wed Dec 13 20:01:38 2017 +0000
committer Yoshito Umaoka <y.umaoka@gmail.com> Wed Dec 13 20:01:38 2017 +0000
tree 9188b87b99c869e4b58e7213e2f42ebd32c69f19
parent 42f3b2d844eb4bd8d2802e3802c41ebf4890d4dd

ICU-13489 Merging addtional change (r40723 - fixing AIX/older gcc build issues) in #13457 to maint-60 for 60.2

X-SVN-Rev: 40727

icu4c/source/i18n/calendar.cpp

diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 4e22dff..092dc4c 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -706,10 +706,10 @@
 fLenient(TRUE),
 fZone(NULL),
 fRepeatedWallTime(UCAL_WALLTIME_LAST),
-fSkippedWallTime(UCAL_WALLTIME_LAST),
-validLocale(""),
-actualLocale("")
+fSkippedWallTime(UCAL_WALLTIME_LAST)
 {
+    validLocale[0] = 0;
+    actualLocale[0] = 0;
     clear();
     if (U_FAILURE(success)) {
         return;
@@ -734,10 +734,10 @@
 fLenient(TRUE),
 fZone(NULL),
 fRepeatedWallTime(UCAL_WALLTIME_LAST),
-fSkippedWallTime(UCAL_WALLTIME_LAST),
-validLocale(""),
-actualLocale("")
+fSkippedWallTime(UCAL_WALLTIME_LAST)
 {
+    validLocale[0] = 0;
+    actualLocale[0] = 0;
     if (U_FAILURE(success)) {
         return;
     }
@@ -768,10 +768,10 @@
 fLenient(TRUE),
 fZone(NULL),
 fRepeatedWallTime(UCAL_WALLTIME_LAST),
-fSkippedWallTime(UCAL_WALLTIME_LAST),
-validLocale(""),
-actualLocale("")
+fSkippedWallTime(UCAL_WALLTIME_LAST)
 {
+    validLocale[0] = 0;
+    actualLocale[0] = 0;
     if (U_FAILURE(success)) {
         return;
     }
@@ -830,6 +830,8 @@
         fNextStamp               = right.fNextStamp;
         uprv_strncpy(validLocale, right.validLocale, sizeof(validLocale));
         uprv_strncpy(actualLocale, right.actualLocale, sizeof(actualLocale));
+        validLocale[sizeof(validLocale)-1] = 0;
+        actualLocale[sizeof(validLocale)-1] = 0;
     }
 
     return *this;