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.

test/jdk/java/util/StringTokenizer/FormFeed.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1997, 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 4017777
+ * @summary Test StringTokenizer on \f character
+ */
+
+import java.util.StringTokenizer;
+
+/**
+ * This class tests to see if the StringTokenizer recognizes
+ * backslash f as a whitespace character (it should)
+ */
+public class FormFeed {
+
+   public static void main(String[] argv) {
+      StringTokenizer st = new StringTokenizer("ABCD\tEFG\fHIJKLM PQR");
+
+      if (st.countTokens() != 4)
+         throw new RuntimeException("StringTokenizer does not treat form feed as whitespace.");
+
+    }
+}

test/jdk/java/util/StringTokenizer/NextTokenWithNullDelimTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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 8360045
+ * @summary Verify StringTokenizer.nextToken(null) does not alter the
+ *      existing delimiter
+ * @run junit NextTokenWithNullDelimTest
+ */
+
+import java.util.StringTokenizer;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class NextTokenWithNullDelimTest {
+    @Test
+    void testNextTokenWithNullDelim() {
+        StringTokenizer st = new StringTokenizer("test");
+        assertThrows(NullPointerException.class, () -> st.nextToken(null));
+        assertDoesNotThrow(st::hasMoreTokens);
+    }
+}

test/jdk/java/util/StringTokenizer/ResetPos.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1999, 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 4238266 @summary Reset the currentposition of
+ * StringTokenizer if delimiters changed in a invocation of nextToken() after
+ * invoking hasMoreTokens()
+ */
+
+
+import java.util.StringTokenizer;
+
+public class ResetPos {
+
+    static void checkValue(String val, String checkVal) {
+        System.out.println("Comparing \""+ val + "\" <----> \"" + checkVal +
+                "\"");
+        if (!val.equals(checkVal))
+            throw new RuntimeException("Test failed");
+    }
+
+    public static void main(String[] argv) {
+        // Simple test
+        StringTokenizer st1 = new StringTokenizer("ab", "b", true);
+        checkValue("a", st1.nextToken("b"));
+        st1.hasMoreTokens();
+        checkValue("b", st1.nextToken(""));
+
+        // Test with retDelims set to true
+        StringTokenizer st2 = new StringTokenizer("abcd efg", "abc", true);
+        st2.hasMoreTokens();
+        checkValue("a", st2.nextToken("bc"));
+        st2.hasMoreTokens();
+        checkValue("b", st2.nextToken());
+        st2.hasMoreTokens();
+        checkValue("cd", st2.nextToken(" ef"));
+        st2.hasMoreTokens();
+        checkValue(" ", st2.nextToken(" "));
+        st2.hasMoreTokens();
+        checkValue("ef", st2.nextToken("g"));
+        st2.hasMoreTokens();
+        checkValue("g", st2.nextToken("g"));
+
+        // Test with changing delimiters
+        StringTokenizer st3 = new StringTokenizer("this is,a interesting,sentence of small, words", ",");
+        st3.hasMoreTokens();
+        checkValue("this is", st3.nextToken()); // "this is"
+        st3.hasMoreTokens();
+        checkValue(",a", st3.nextToken(" "));   // ",a"
+        st3.hasMoreTokens();
+        checkValue(" interesting", st3.nextToken(",")); // " interesting"
+        st3.hasMoreTokens();
+        checkValue(",sentence", st3.nextToken(" ")); // ",sentence"
+        st3.hasMoreTokens();
+        checkValue(" of small", st3.nextToken(",")); // " of small"
+        st3.hasMoreTokens();
+        checkValue(" words", st3.nextToken()); // " words"
+    }
+}

test/jdk/java/util/StringTokenizer/Supplementary.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003, 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.
+ */
+
+/*
+ *I
+ * @test
+ * @bug 4900727
+ * @summary Unit test for supplementary characters (JSR-204)
+ */
+
+import java.util.StringTokenizer;
+
+public class Supplementary {
+    public static void main(String[] args) {
+        String text =
+            "ab\uD800\uDC00\uD800\uDC01cd\uD800\uDC00\uD800xy \uD801\uDC00z\t123\uDCFF456";
+        String delims = " \t\r\n\f.\uD800\uDC00,:;";
+        String[] expected =
+            {"ab", "\uD800\uDC01cd", "\uD800xy", "\uD801\uDC00z", "123\uDCFF456" };
+        testTokenizer(text, delims, expected);
+
+        delims = " \t\r\n\f.,:;\uDCFF";
+        expected = new String[] { "ab\uD800\uDC00\uD800\uDC01cd\uD800\uDC00\uD800xy",
+                                  "\uD801\uDC00z",
+                                  "123",
+                                  "456" };
+        testTokenizer(text, delims, expected);
+
+        delims = "\uD800";
+        expected = new String[] { "ab\uD800\uDC00\uD800\uDC01cd\uD800\uDC00",
+                                  "xy \uD801\uDC00z\t123\uDCFF456" };
+        testTokenizer(text, delims, expected);
+    }
+
+    static void testTokenizer(String text, String delims, String[] expected) {
+        StringTokenizer tokenizer = new StringTokenizer(text, delims);
+        int n = tokenizer.countTokens();
+        if (n != expected.length) {
+            throw new RuntimeException("countToken(): wrong value " + n
+                                       + ", expected " + expected.length);
+        }
+        int i = 0;
+        while (tokenizer.hasMoreTokens()) {
+            String token = tokenizer.nextToken();
+            if (!token.equals(expected[i++])) {
+                throw new RuntimeException("nextToken(): wrong token. got \""
+                                           + token + "\", expected \"" + expected[i-1]);
+            }
+        }
+        if (i != expected.length) {
+            throw new RuntimeException("unexpected the number of tokens: " + i
+                                       + ", expected " + expected.length);
+        }
+    }
+}