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

ICU-22615 Test TimeZoneNames API will not assert with non ASCII.

Browse source 
Add tests and return error when the ID is non ASCII
This commit is contained in:
Frank Tang 2023-12-18 19:23:20 -08:00 • committed by Frank Yung-Fong Tang
parent cd251ee62e
commit abcb80fd53
3 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include "ureslocs.h"
#include "zonemeta.h"
#include "ucln_in.h"
#include "uinvchar.h"
#include "uvector.h"
#include "olsontz.h"
@ -2280,6 +2281,10 @@ TZDBTimeZoneNames::getMetaZoneNames(const UnicodeString& mzID, UErrorCode& statu
return nullptr;
}
mzIDKey[mzID.length()] = 0;
if (!uprv_isInvariantUString(mzIDKey, mzID.length())) {
status = U_ILLEGAL_ARGUMENT_ERROR;
return nullptr;
}
static UMutex gTZDBNamesMapLock;
umtx_lock(&gTZDBNamesMapLock);

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

@ -89,6 +89,7 @@ TimeZoneFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &name
TESTCASE(9, TestCentralTime);
TESTCASE(10, TestBogusLocale);
TESTCASE(11, Test22614GetMetaZoneNamesNotCrash);
TESTCASE(12, Test22615NonASCIIID);
default: name = ""; break;
}
}
@ -1316,6 +1317,52 @@ TimeZoneFormatTest::TestFormatCustomZone() {
}
}
void
TimeZoneFormatTest::Test22615NonASCIIID() {
UErrorCode status = U_ZERO_ERROR;
LocalPointer<TimeZoneNames> tzdb(TimeZoneNames::createTZDBInstance(Locale("en"), status));
// A test to ensure under the debugging build non ASCII id will not cause
// internal assertion error.
UnicodeString id(9, u'\u00C0', 8);
UnicodeString output;
tzdb->getMetaZoneDisplayName(id, UTZNM_SHORT_STANDARD, output);
assertTrue("getMetaZoneID of non ASCII id should return bogus string",
output.isBogus());
status = U_ZERO_ERROR;
std::unique_ptr<icu::StringEnumeration> enumeration(
tzdb->getAvailableMetaZoneIDs(id, status));
assertSuccess("getAvailableMetaZoneIDs should success", status);
assertEquals("getAvailableMetaZoneIDs with non ASCII id return 0 ids",
0, enumeration->count(status));
assertSuccess("count should success", status);
output.remove();
tzdb->getMetaZoneID(id, 0, output);
assertTrue("getMetaZoneID of non ASCII id should return bogus string",
output.isBogus());
output.remove();
tzdb->getMetaZoneDisplayName(id, UTZNM_EXEMPLAR_LOCATION, output);
assertTrue("getMetaZoneDisplayName of non ASCII id should return bogus string",
output.isBogus());
output.remove();
tzdb->getTimeZoneDisplayName(id, UTZNM_SHORT_DAYLIGHT, output);
assertTrue("getTimeZoneDisplayName of non ASCII id should return bogus string",
output.isBogus());
output.remove();
tzdb->getExemplarLocationName(id, output);
assertTrue("getExemplarLocationName of non ASCII id should return bogus string",
output.isBogus());
output.remove();
tzdb->getDisplayName(id, UTZNM_LONG_GENERIC, 0, output);
assertTrue("getDisplayName of non ASCII id should return bogus string",
output.isBogus());
}
void
TimeZoneFormatTest::Test22614GetMetaZoneNamesNotCrash() {
UErrorCode status = U_ZERO_ERROR;

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

@ -33,6 +33,7 @@ class TimeZoneFormatTest : public IntlTest {
void TestCentralTime();
void TestBogusLocale();
void Test22614GetMetaZoneNamesNotCrash();
void Test22615NonASCIIID();
void RunTimeRoundTripTests(int32_t threadNumber);
void RunAdoptDefaultThreadSafeTests(int32_t threadNumber);