undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
256
test/jdk/java/util/TimeZone/Bug6329116.java
Normal file
256
test/jdk/java/util/TimeZone/Bug6329116.java
Normal file
|
|
@ -0,0 +1,256 @@
|
|||
/*
|
||||
* Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6329116 6756569 6757131 6758988 6764308 6796489 6834474 6609737 6507067
|
||||
* 7039469 7090843 7103108 7103405 7158483 8008577 8059206 8064560 8072042
|
||||
* 8077685 8151876 8166875 8169191 8170316 8176044 8174269 8347841 8347955
|
||||
* @summary Make sure that timezone short display names are identical to Olson's data.
|
||||
* @run junit Bug6329116
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
import java.time.ZoneId;
|
||||
import java.util.*;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
public class Bug6329116 {
|
||||
|
||||
// Do not test all locales, as some locales have localized
|
||||
// short names in CLDR. Test only for the US locale
|
||||
|
||||
// static Locale[] locales = Locale.getAvailableLocales();
|
||||
static Locale[] locales = {Locale.US};
|
||||
static String[] timezones = TimeZone.availableIDs()
|
||||
.filter(Predicate.not(ZoneId.SHORT_IDS::containsKey))
|
||||
.toArray(String[]::new);
|
||||
|
||||
@Test
|
||||
public void bug6329116() throws IOException {
|
||||
boolean err = false;
|
||||
|
||||
HashMap<String, String> aliasTable = new HashMap<>();
|
||||
HashSet<String> timezoneTable = new HashSet<>();
|
||||
for (String t : timezones) {
|
||||
timezoneTable.add(t);
|
||||
}
|
||||
|
||||
String line, key, value;
|
||||
StringTokenizer st;
|
||||
|
||||
try (TextFileReader in = new TextFileReader("aliases.txt")) {
|
||||
while ((line = in.readLine()) != null) {
|
||||
st = new StringTokenizer(line);
|
||||
st.nextToken();
|
||||
key = st.nextToken();
|
||||
value = st.nextToken();
|
||||
|
||||
if (!value.equals("ROC")) {
|
||||
if (aliasTable.containsKey(key)) {
|
||||
aliasTable.put(key, aliasTable.get(key) + " " + value);
|
||||
} else {
|
||||
aliasTable.put(key, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try (TextFileReader in = new TextFileReader("displaynames.txt")) {
|
||||
String timezoneID, expected, expected_DST, got;
|
||||
String[] aliases, tzs;
|
||||
TimeZone tz;
|
||||
while ((line = in.readLine()) != null) {
|
||||
st = new StringTokenizer(line);
|
||||
timezoneID = st.nextToken();
|
||||
expected = st.nextToken();
|
||||
if (st.hasMoreTokens()) {
|
||||
expected_DST = st.nextToken();
|
||||
} else {
|
||||
expected_DST = null;
|
||||
}
|
||||
|
||||
if (aliasTable.containsKey(timezoneID)) {
|
||||
aliases = aliasTable.get(timezoneID).split(" ");
|
||||
tzs = new String[1 + aliases.length];
|
||||
System.arraycopy(aliases, 0, tzs, 1, aliases.length);
|
||||
aliasTable.remove(timezoneID);
|
||||
} else {
|
||||
tzs = new String[1];
|
||||
}
|
||||
tzs[0] = timezoneID;
|
||||
|
||||
for (int j = 0; j < tzs.length; j++) {
|
||||
if (ZoneId.SHORT_IDS.containsKey(tzs[j])) {
|
||||
continue;
|
||||
}
|
||||
tz = TimeZone.getTimeZone(tzs[j]);
|
||||
|
||||
if (!tzs[j].equals(tz.getID())) {
|
||||
System.err.println(tzs[j] + " may not be a valid Timezone ID and \"" + tz.getID() + "\" was returned. Please check it.");
|
||||
err = true;
|
||||
}
|
||||
|
||||
timezoneTable.remove(tzs[j]);
|
||||
|
||||
for (int i = 0; i < locales.length; i++) {
|
||||
got = tz.getDisplayName(false, TimeZone.SHORT, locales[i]);
|
||||
if (!expected.equals(got) &&
|
||||
!expected.startsWith(got + "/") &&
|
||||
!expected.endsWith("/" + got)) {
|
||||
if (useLocalizedShortDisplayName(tz, locales[i], got, false)) {
|
||||
/*
|
||||
System.out.println(tzs[j] +
|
||||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") +
|
||||
" seems to use a localized short display name" +
|
||||
": original: " + expected +
|
||||
": got: " + got + " for non-DST in " +
|
||||
locales[i] + " locale.");
|
||||
*/
|
||||
} else {
|
||||
System.err.println(tzs[j] +
|
||||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") +
|
||||
": expected: " + expected +
|
||||
": got: " + got + " for non-DST in " +
|
||||
locales[i] + " locale.");
|
||||
err = true;
|
||||
}
|
||||
}
|
||||
|
||||
got = tz.getDisplayName(true, TimeZone.SHORT, locales[i]);
|
||||
if (expected_DST != null) {
|
||||
if (!expected_DST.equals(got) &&
|
||||
!expected_DST.startsWith(got + "/") &&
|
||||
!expected_DST.endsWith("/" + got)) {
|
||||
if (tzs[j].equals("Europe/London") &&
|
||||
locales[i].equals(new Locale("en", "IE"))) {
|
||||
continue;
|
||||
} else if (useLocalizedShortDisplayName(tz, locales[i], got, true)) {
|
||||
/*
|
||||
System.out.println(tzs[j] +
|
||||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") +
|
||||
" seems to use a localized short display name" +
|
||||
": original: " + expected_DST +
|
||||
": got: " + got + " for DST in " +
|
||||
locales[i] + " locale.");
|
||||
*/
|
||||
continue;
|
||||
}
|
||||
System.err.println(tzs[j] +
|
||||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") +
|
||||
": expected: " + expected_DST +
|
||||
": got: " + got + " for DST in " +
|
||||
locales[i] + " locale.");
|
||||
err = true;
|
||||
}
|
||||
} else {
|
||||
// Some timezones don't have DST display names in Olson's data,
|
||||
// and we created them ourselves based on non-DST display names
|
||||
// to prepare potential use in the future.
|
||||
// Because there's no expected name, we don't judge if these
|
||||
// DST display names are correct but just compare them with
|
||||
// non-DST diplay names for checking with our eyes .
|
||||
if (!expected.equals(got) &&
|
||||
!expected.startsWith(got + "/") &&
|
||||
!expected.endsWith("/" + got)) {
|
||||
/*
|
||||
System.out.println("## " + tzs[j] +
|
||||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") +
|
||||
": expected: " + expected +
|
||||
": got: " + got + " for DST in " +
|
||||
locales[i] + " locale.");
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!timezoneTable.isEmpty()) {
|
||||
System.out.println("# Timezone(s) valid in JRE but untested in this test program:");
|
||||
Iterator<String> it = timezoneTable.iterator();
|
||||
while (it.hasNext()) {
|
||||
System.out.println(it.next());
|
||||
}
|
||||
System.out.println();
|
||||
}
|
||||
|
||||
if (!aliasTable.isEmpty()) {
|
||||
System.out.println("# Timezone(s) exists in Olson's data as Link but unused in JRE:");
|
||||
for (Map.Entry<String, String> entry : aliasTable.entrySet()) {
|
||||
System.out.println(entry);
|
||||
}
|
||||
}
|
||||
|
||||
if (err) {
|
||||
fail("At least one timezone display name is incorrect.");
|
||||
}
|
||||
}
|
||||
|
||||
static boolean useLocalizedShortDisplayName(TimeZone tz,
|
||||
Locale locale,
|
||||
String got,
|
||||
boolean inDST) {
|
||||
// if (locale.getLanguage().equals("de")) {
|
||||
// String name = tz.getDisplayName(inDST, TimeZone.LONG, locale);
|
||||
// if (inDST) {
|
||||
// if (("Mitteleurop\u00e4ische Sommerzeit".equals(name) && "MESZ".equals(got)) ||
|
||||
// ("Osteurop\u00e4ische Sommerzeit".equals(name) && "OESZ".equals(got)) ||
|
||||
// ("Westeurop\u00e4ische Sommerzeit".equals(name) && "WESZ".equals(got))) {
|
||||
// return true;
|
||||
// }
|
||||
// } else {
|
||||
// if (("Mitteleurop\u00e4ische Zeit".equals(name) && "MEZ".equals(got)) ||
|
||||
// ("Osteurop\u00e4ische Zeit".equals(name) && "OEZ".equals(got)) ||
|
||||
// ("Westeurop\u00e4ische Zeit".equals(name) && "WEZ".equals(got))) {
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// } else if (locale.getLanguage().equals("zh") &&
|
||||
// (locale.getCountry().equals("TW") || locale.getCountry().equals("HK"))) {
|
||||
// String name = tz.getDisplayName(inDST, TimeZone.LONG, locale);
|
||||
// if (inDST) {
|
||||
// if (("\u53f0\u7063\u590f\u4ee4\u6642\u9593".equals(name) && "TDT".equals(got))) {
|
||||
// return true;
|
||||
// }
|
||||
// } else {
|
||||
// if (("\u53f0\u7063\u6a19\u6e96\u6642\u9593".equals(name) && "TST".equals(got))) {
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// If we get a TimeZone with GMT+hh:mm format, we can ignore the offset value
|
||||
if (tz.getDisplayName(Locale.ENGLISH).startsWith("GMT+") || tz.getDisplayName(Locale.ENGLISH).startsWith("GMT-")) {
|
||||
return tz.getDisplayName().substring(0, 3).equals(got.substring(0, 3));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue