organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-13489 Merging #13457(r40670) Potential calendar bufer overrun to maint-60 for 60.2.

Browse source 
X-SVN-Rev: 40692
This commit is contained in:
Yoshito Umaoka 2017-12-05 02:26:41 +00:00
parent 415164bf13
commit 20b5a6f1be
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;