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/text/Format/CompactNumberFormat/TestUExtensionOverride.java
+++ b/test/jdk/java/text/Format/CompactNumberFormat/TestUExtensionOverride.java
@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, 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 8177552 8221432
+ * @summary Checks the behaviour of Unicode BCP 47 U Extension with
+ *          compact number format
+ * @modules jdk.localedata
+ * @run junit/othervm TestUExtensionOverride
+ */
+
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.Locale;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class TestUExtensionOverride {
+
+    Object[][] compactFormatData() {
+        return new Object[][]{
+            // locale, number, formatted string
+
+            // -nu
+            {Locale.forLanguageTag("en-US-u-nu-deva"), 12345, "\u0967\u0968K"},
+            {Locale.forLanguageTag("en-US-u-nu-sinh"), 12345, "\u0de7\u0de8K"},
+            {Locale.forLanguageTag("en-US-u-nu-zzzz"), 12345, "12K"},
+            // -rg
+            {Locale.forLanguageTag("fr-FR-u-rg-cazzzz"), 1234567,
+                "1\u00a0M"},
+            {Locale.forLanguageTag("fr-FR-u-rg-cazzzz"), 1234567890,
+                "1\u00a0G"},
+            // -nu and -rg
+            {Locale.forLanguageTag("en-US-u-nu-deva-rg-dezzzz"), 12345,
+                "\u0967\u0968K"},
+            {Locale.forLanguageTag("fr-FR-u-nu-zzzz-rg-cazzzz"), 1234567890,
+                "1\u00a0Md"},
+            {Locale.forLanguageTag("fr-FR-u-nu-zzzz-rg-zzzz"), 12345,
+                "12\u00a0k"},
+            {Locale.forLanguageTag("fr-FR-u-rg-cazzzz-nu-deva"), 12345,
+                "\u0967\u0968\u00a0k"},};
+    }
+
+    Object[][] compactParseData() {
+        return new Object[][]{
+            // locale, parse string, parsed number
+
+            // -nu
+            {Locale.forLanguageTag("en-US-u-nu-deva"),
+                "\u0967\u0968K", 12000L},
+            {Locale.forLanguageTag("en-US-u-nu-sinh"),
+                "\u0de7\u0de8K", 12000L},
+            {Locale.forLanguageTag("en-US-u-nu-zzzz"),
+                "12K", 12000L},
+            // -rg
+            {Locale.forLanguageTag("fr-FR-u-rg-cazzzz"),
+                "1\u00a0G", 1000000000L},
+            // -nu and -rg
+            {Locale.forLanguageTag("en-US-u-nu-deva-rg-dezzzz"),
+                "\u0967\u0968K", 12000L},
+            {Locale.forLanguageTag("fr-FR-u-nu-zzzz-rg-cazzzz"),
+                "1\u00a0Md", 1000000000L},
+            {Locale.forLanguageTag("fr-FR-u-nu-zzzz-rg-zzzz"),
+                "12\u00a0k", 12000L},
+            {Locale.forLanguageTag("fr-FR-u-rg-cazzzz-nu-deva"),
+                "\u0967\u0968\u00a0k", 12000L},};
+    }
+
+    @ParameterizedTest
+    @MethodSource("compactFormatData")
+    void testFormat(Locale locale, double num,
+            String expected) {
+        NumberFormat cnf = NumberFormat.getCompactNumberInstance(locale,
+                NumberFormat.Style.SHORT);
+        CompactFormatAndParseHelper.testFormat(cnf, num, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("compactParseData")
+    void testParse(Locale locale, String parseString,
+            Number expected) throws ParseException {
+        NumberFormat cnf = NumberFormat.getCompactNumberInstance(locale,
+                NumberFormat.Style.SHORT);
+        CompactFormatAndParseHelper.testParse(cnf, parseString, expected, null, null);
+    }
+
+}