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

ICU-11007 Improved checking for NULL time zones in calendar code.

Browse Source 
X-SVN-Rev: 36025
This commit is contained in:
Andy Heninger 2014-07-14 23:39:06 +00:00
parent 61ee3253e8
commit 76aaa9229f
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,11 +680,14 @@ fAreFieldsVirtuallySet(FALSE),
fNextStamp((int32_t)kMinimumUserStamp),
fTime(0),
fLenient(TRUE),
fZone(0),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
{
clear();
if (U_FAILURE(success)) {
return;
}
fZone = TimeZone::createDefault();
if (fZone == NULL) {
success = U_MEMORY_ALLOCATION_ERROR;
@ -703,10 +706,13 @@ fAreFieldsVirtuallySet(FALSE),
fNextStamp((int32_t)kMinimumUserStamp),
fTime(0),
fLenient(TRUE),
fZone(0),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
{
if (U_FAILURE(success)) {
return;
}
if(zone == 0) {
#if defined (U_DEBUG_CAL)
fprintf(stderr, "%s:%d: ILLEGAL ARG because timezone cannot be 0\n",
@ -718,7 +724,6 @@ fSkippedWallTime(UCAL_WALLTIME_LAST)
clear();
fZone = zone;
setWeekData(aLocale, NULL, success);
}
@ -733,10 +738,13 @@ fAreFieldsVirtuallySet(FALSE),
fNextStamp((int32_t)kMinimumUserStamp),
fTime(0),
fLenient(TRUE),
fZone(0),
fZone(NULL),
fRepeatedWallTime(UCAL_WALLTIME_LAST),
fSkippedWallTime(UCAL_WALLTIME_LAST)
{
if (U_FAILURE(success)) {
return;
}
clear();
fZone = zone.clone();
if (fZone == NULL) {
@ -757,7 +765,7 @@ Calendar::~Calendar()
Calendar::Calendar(const Calendar &source)
: UObject(source)
{
fZone = 0;
fZone = NULL;
*this = source;
}
@ -778,9 +786,8 @@ Calendar::operator=(const Calendar &right)
fLenient = right.fLenient;
fRepeatedWallTime = right.fRepeatedWallTime;
fSkippedWallTime = right.fSkippedWallTime;
if (fZone != NULL) {
delete fZone;
}
delete fZone;
fZone = NULL;
if (right.fZone != NULL) {
fZone = right.fZone->clone();
}
@ -2307,7 +2314,7 @@ Calendar::adoptTimeZone(TimeZone* zone)
if (zone == NULL) return;
// fZone should always be non-null
if (fZone != NULL) delete fZone;
delete fZone;
fZone = zone;
// if the zone changes, we need to recompute the time fields
@ -2326,6 +2333,7 @@ Calendar::setTimeZone(const TimeZone& zone)
const TimeZone&
Calendar::getTimeZone() const
{
U_ASSERT(fZone != NULL);
return *fZone;
}
@ -2334,9 +2342,14 @@ Calendar::getTimeZone() const
TimeZone*
Calendar::orphanTimeZone()
{
TimeZone *z = fZone;
// we let go of the time zone; the new time zone is the system default time zone
fZone = TimeZone::createDefault();
TimeZone *defaultZone = TimeZone::createDefault();
if (defaultZone == NULL) {
// No error handling available. Must keep fZone non-NULL, there are many unchecked uses.
return NULL;
}
TimeZone *z = fZone;
fZone = defaultZone;
return z;
}

4
icu4c/source/i18n/islamcal.cpp
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 2003-2013, International Business Machines Corporation
* Copyright (C) 2003-2014, International Business Machines Corporation
* and others. All Rights Reserved.
******************************************************************************
*
@ -610,7 +610,7 @@ UBool
IslamicCalendar::inDaylightTime(UErrorCode& status) const
{
// copied from GregorianCalendar
if (U_FAILURE(status) || (&(getTimeZone()) == NULL && !getTimeZone().useDaylightTime()))
if (U_FAILURE(status) || !getTimeZone().useDaylightTime())
return FALSE;
// Force an update of the state of the Calendar.