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

ICU-13312 Fixed getDisplayName crash issue caused by TZDBTimeZoneNames, added a test case for the fix that interate through all time zones.

Browse source 
X-SVN-Rev: 40412
This commit is contained in:
Yoshito Umaoka 2017-09-14 02:37:44 +00:00
parent e503f584ed
commit ed012e1bfb
4 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
icu4c/source/i18n/tznames_impl.cpp
View file

@ -2056,6 +2056,9 @@ static void U_CALLCONV prepareFind(UErrorCode &status) {
if (U_SUCCESS(status)) {
while ((mzID = mzIDs->snext(status)) && U_SUCCESS(status)) {
const TZDBNames *names = TZDBTimeZoneNames::getMetaZoneNames(*mzID, status);
if (U_FAILURE(status)) {
break;
}
if (names == NULL) {
continue;
}
@ -2187,9 +2190,11 @@ TZDBTimeZoneNames::getMetaZoneDisplayName(const UnicodeString& mzID,
UErrorCode status = U_ZERO_ERROR;
const TZDBNames *tzdbNames = TZDBTimeZoneNames::getMetaZoneNames(mzID, status);
if (U_SUCCESS(status)) {
const UChar *s = tzdbNames->getName(type);
if (s != NULL) {
name.setTo(TRUE, s, -1);
if (tzdbNames != NULL) {
const UChar *s = tzdbNames->getName(type);
if (s != NULL) {
name.setTo(TRUE, s, -1);
}
}
}

2
icu4c/source/i18n/tznames_impl.h
View file

@ -246,6 +246,8 @@ public:
TimeZoneNames::MatchInfoCollection* find(const UnicodeString& text, int32_t start, uint32_t types, UErrorCode& status) const;
// When TZDBNames for the metazone is not available, this method returns NULL,
// but does NOT set U_MISSING_RESOURCE_ERROR to status.
static const TZDBNames* getMetaZoneNames(const UnicodeString& mzId, UErrorCode& status);
private:

42
icu4c/source/test/intltest/tzfmttst.cpp
View file

@ -83,7 +83,8 @@ TimeZoneFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &name
TESTCASE(4, TestFormat);
TESTCASE(5, TestFormatTZDBNames);
TESTCASE(6, TestFormatCustomZone);
default: name = ""; break;
TESTCASE(7, TestFormatTZDBNamesAllZoneCoverage);
default: name = ""; break;
}
}
@ -1251,5 +1252,44 @@ TimeZoneFormatTest::TestFormatCustomZone(void) {
}
}
void
TimeZoneFormatTest::TestFormatTZDBNamesAllZoneCoverage(void) {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<StringEnumeration> tzids(TimeZone::createEnumeration());
const UnicodeString *tzid;
LocalPointer<TimeZoneNames> tzdbNames(TimeZoneNames::createTZDBInstance(Locale("en"), status));
UDate now = Calendar::getNow();
UnicodeString mzId;
UnicodeString name;
while ((tzid = tzids->snext(status))) {
logln("Zone: " + *tzid);
LocalPointer<TimeZone> tz(TimeZone::createTimeZone(*tzid));
tzdbNames->getMetaZoneID(*tzid, now, mzId);
if (mzId.isBogus()) {
logln((UnicodeString)"Meta zone: <not available>");
} else {
logln((UnicodeString)"Meta zone: " + mzId);
}
// mzID could be bogus here
tzdbNames->getMetaZoneDisplayName(mzId, UTZNM_SHORT_STANDARD, name);
// name could be bogus here
if (name.isBogus()) {
logln((UnicodeString)"Meta zone short standard name: <not available>");
}
else {
logln((UnicodeString)"Meta zone short standard name: " + name);
}
tzdbNames->getMetaZoneDisplayName(mzId, UTZNM_SHORT_DAYLIGHT, name);
// name could be bogus here
if (name.isBogus()) {
logln((UnicodeString)"Meta zone short daylight name: <not available>");
}
else {
logln((UnicodeString)"Meta zone short daylight name: " + name);
}
}
}
#endif /* #if !UCONFIG_NO_FORMATTING */

1
icu4c/source/test/intltest/tzfmttst.h
View file

@ -28,6 +28,7 @@ class TimeZoneFormatTest : public IntlTest {
void TestFormat(void);
void TestFormatTZDBNames(void);
void TestFormatCustomZone(void);
void TestFormatTZDBNamesAllZoneCoverage(void);
void RunTimeRoundTripTests(int32_t threadNumber);
};