organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 22:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6132 Check dereferencing null pointers, fCalendar and fNumberFormat.

Browse source 
X-SVN-Rev: 23200
This commit is contained in:
Michael Ow 2008-01-09 23:39:39 +00:00
parent 0b6146f394
commit 653f0ded15
1 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
icu4c/source/i18n/datefmt.cpp
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1997-2007, International Business Machines Corporation and *
* Copyright (C) 1997-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@ -346,7 +346,10 @@ DateFormat::adoptCalendar(Calendar* newCalendar)
void
DateFormat::setCalendar(const Calendar& newCalendar)
{
adoptCalendar(newCalendar.clone());
Calendar* newCalClone = newCalendar.clone();
if (newCalClone != NULL) {
adoptCalendar(newCalClone);
}
}
//----------------------------------------------------------------------
@ -371,7 +374,10 @@ DateFormat::adoptNumberFormat(NumberFormat* newNumberFormat)
void
DateFormat::setNumberFormat(const NumberFormat& newNumberFormat)
{
adoptNumberFormat((NumberFormat*)newNumberFormat.clone());
NumberFormat* newNumFmtClone = (NumberFormat*)newNumberFormat.clone();
if (newNumFmtClone != NULL) {
adoptNumberFormat(newNumFmtClone);
}
}
//----------------------------------------------------------------------
@ -387,14 +393,18 @@ DateFormat::getNumberFormat() const
void
DateFormat::adoptTimeZone(TimeZone* zone)
{
fCalendar->adoptTimeZone(zone);
if (fCalendar != NULL) {
fCalendar->adoptTimeZone(zone);
}
}
//----------------------------------------------------------------------
void
DateFormat::setTimeZone(const TimeZone& zone)
{
fCalendar->setTimeZone(zone);
if (fCalendar != NULL) {
fCalendar->setTimeZone(zone);
}
}
//----------------------------------------------------------------------
@ -402,7 +412,12 @@ DateFormat::setTimeZone(const TimeZone& zone)
const TimeZone&
DateFormat::getTimeZone() const
{
return fCalendar->getTimeZone();
if (fCalendar != NULL) {
return fCalendar->getTimeZone();
}
// If calendar doesn't exists, create default timezone.
// fCalendar is rarely null
return *(TimeZone::createDefault());
}
//----------------------------------------------------------------------
@ -410,7 +425,9 @@ DateFormat::getTimeZone() const
void
DateFormat::setLenient(UBool lenient)
{
fCalendar->setLenient(lenient);
if (fCalendar != NULL) {
fCalendar->setLenient(lenient);
}
}
//----------------------------------------------------------------------
@ -418,7 +435,11 @@ DateFormat::setLenient(UBool lenient)
UBool
DateFormat::isLenient() const
{
return fCalendar->isLenient();
if (fCalendar != NULL) {
return fCalendar->isLenient();
}
// fCalendar is rarely null
return FALSE;
}
U_NAMESPACE_END