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.
2026-03-26 17:11:57 -04:00 · 2026-03-26 17:11:57 -04:00 · 0a580b313d
commit 0a580b313d
70422 changed files with 17213626 additions and 0 deletions
--- a/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java
+++ b/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java
@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2007, 2024, 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 4052440 8062588 8210406 8174269
+ * @summary CollatorProvider tests
+ * @library providersrc/foobarutils
+ *          providersrc/fooprovider
+ * @modules java.base/sun.util.locale.provider
+ *          java.base/sun.util.resources
+ * @build com.foobar.Utils
+ *        com.foo.*
+ * @run main/othervm -Djava.locale.providers=CLDR,SPI CollatorProviderTest
+ */
+
+import java.text.Collator;
+import java.text.ParseException;
+import java.text.RuleBasedCollator;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import com.foo.CollatorProviderImpl;
+
+import sun.util.locale.provider.AvailableLanguageTags;
+import sun.util.locale.provider.LocaleProviderAdapter;
+import sun.util.locale.provider.ResourceBundleBasedAdapter;
+
+public class CollatorProviderTest extends ProviderTest {
+
+    CollatorProviderImpl cp = new CollatorProviderImpl();
+    List<Locale> availloc = Arrays.asList(Collator.getAvailableLocales());
+    List<Locale> providerloc = Arrays.asList(cp.getAvailableLocales());
+    List<Locale> fallbackloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getAvailableLocales());
+    List<Locale> fallbackimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getCollatorProvider().getAvailableLocales());
+
+    public static void main(String[] s) {
+        new CollatorProviderTest();
+    }
+
+    CollatorProviderTest() {
+        availableLocalesTest();
+        objectValidityTest();
+    }
+
+    void availableLocalesTest() {
+        Set<Locale> localesFromAPI = new HashSet<>(availloc);
+        Set<Locale> localesExpected = new HashSet<>(fallbackloc);
+        localesExpected.addAll(providerloc);
+        if (localesFromAPI.equals(localesExpected)) {
+            System.out.println("availableLocalesTest passed.");
+        } else {
+            localesFromAPI.removeAll(localesExpected);
+            throw new RuntimeException("availableLocalesTest failed"+ localesFromAPI);
+        }
+    }
+
+    void objectValidityTest() {
+        Collator def = Collator.getInstance(Locale.of(""));
+        String defrules = ((RuleBasedCollator)def).getRules();
+
+        for (Locale target: availloc) {
+            // pure JRE implementation
+            Set<Locale> fbil = new HashSet<>();
+            for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK).getCollatorProvider()).getAvailableLanguageTags()) {
+                fbil.add(Locale.forLanguageTag(tag));
+            }
+            ResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.FALLBACK)).getLocaleData().getCollationData(target);
+            boolean fbSupportsLocale = fbil.contains(target);
+
+            // result object
+            Collator result = Collator.getInstance(target);
+
+            // provider's object (if any)
+            Collator providersResult = null;
+            if (providerloc.contains(target)) {
+                providersResult = cp.getInstance(target);
+            }
+
+            // Fallback rule
+            Collator fbResult = null;
+            if (fbSupportsLocale) {
+                try {
+                    String rules = rb.getString("Rule");
+                    fbResult = new RuleBasedCollator(defrules+rules);
+                    fbResult.setDecomposition(Collator.NO_DECOMPOSITION);
+                } catch (MissingResourceException mre) {
+                } catch (ParseException pe) {
+                }
+            }
+
+            checkValidity(target, fbResult, providersResult, result, fbSupportsLocale);
+        }
+    }
+}