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

ICU-22637 Accept non-ASCII digit to fix mistake

Browse source
This commit is contained in:
Frank Tang 2024-01-22 12:54:12 -08:00 • committed by Frank Yung-Fong Tang
parent 49a7a1e76d
commit 7c48842e23
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1376,11 +1376,6 @@ TimeZone::parseCustomID(const UnicodeString& id, int32_t& sign,
if (0 != u_strncasecmp(id.getBuffer(), GMT_ID, GMT_ID_LENGTH, 0)) {
return false;
}
// ICU_Utility::parseNumber also accept non ASCII digits so we need to first
// check we only have ASCII chars.
if (!uprv_isInvariantUString(id.getBuffer(), id.length())) {
return false;
}
sign = 1;
hour = 0;
min = 0;

6
icu4c/source/test/intltest/tztest.cpp
View file

@ -1218,9 +1218,9 @@ void TimeZoneTest::TestCustomParse()
{u"GMT-B111", kUnparseable}, // ICU-22637
{u"GMT-b111", kUnparseable}, // ICU-22637
{u"GMT-0b11", kUnparseable}, // ICU-22637
{u"GMT-๑๒", kUnparseable}, // ICU-22637
{u"GMT-๑๒:๓๔", kUnparseable}, // ICU-22637
{u"GMT+๑๒:๓๔:๕๖", kUnparseable}, // ICU-22637
{u"GMT-๑๒", (-((12*60)*60))}, // ICU-22637
{u"GMT-๑๒:๓๔", (-((12*60+34)*60))}, // ICU-22637
{u"GMT+๑๒:๓๔:๕๖", ((12*60+34)*60+56)}, // ICU-22637
{0, 0}
};

5
icu4j/main/core/src/main/java/com/ibm/icu/impl/ZoneMeta.java
View file

@ -697,11 +697,6 @@ public final class ZoneMeta {
}
pos[0]++;
int start = pos[0];
// Utility.parseNumber also accept non ASCII digits so we need to first
// check we only have ASCII chars.
if (!id.chars().allMatch(c -> c < 128)) {
return false;
}
hour = Utility.parseNumber(id, pos, 10);
if (pos[0] == id.length()) {
// Handle the following cases

6
icu4j/main/core/src/test/java/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View file

@ -315,9 +315,9 @@ public class TimeZoneTest extends CoreTestFmwk
"GMT-B111", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT-b111", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT-0b11", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT-๑๒", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT-๑๒:๓๔", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT+๑๒:๓๔:๕๖", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637
"GMT-๑๒", "-43200", "GMT-12:00", // ICU-22637
"GMT-๑๒:๓๔", "-45240", "GMT-12:34", // ICU-22637
"GMT+๑๒:๓๔:๕๖", "45296", "GMT+12:34:56", // ICU-22637
};
for (int i = 0; i < DATA.length; i += 3) {
String id = DATA[i];