AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-13457 Fix initialization & copying of Calendar::validLocale & actualLocale.

Browse Source 
X-SVN-Rev: 40670
This commit is contained in:
Andy Heninger 2017-11-12 02:53:40 +00:00
parent 179510836d
commit d2cf99c677
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/i18n/calendar.cpp
View File

@ -706,7 +706,9 @@ fTime(0),
fLenient(TRUE),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
fSkippedWallTime(UCAL_WALLTIME_LAST),
validLocale(""),
actualLocale("")
{
clear();
if (U_FAILURE(success)) {
@ -732,7 +734,9 @@ fTime(0),
fLenient(TRUE),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
fSkippedWallTime(UCAL_WALLTIME_LAST),
validLocale(""),
actualLocale("")
{
if (U_FAILURE(success)) {
return;
@ -764,7 +768,9 @@ fTime(0),
fLenient(TRUE),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
fSkippedWallTime(UCAL_WALLTIME_LAST),
validLocale(""),
actualLocale("")
{
if (U_FAILURE(success)) {
return;
@ -822,8 +828,8 @@ Calendar::operator=(const Calendar &right)
fWeekendCease = right.fWeekendCease;
fWeekendCeaseMillis = right.fWeekendCeaseMillis;
fNextStamp = right.fNextStamp;
uprv_strcpy(validLocale, right.validLocale);
uprv_strcpy(actualLocale, right.actualLocale);
uprv_strncpy(validLocale, right.validLocale, sizeof(validLocale));
uprv_strncpy(actualLocale, right.actualLocale, sizeof(actualLocale));
}
return *this;