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/tools/jpackage/windows/WinConsoleTest.java
+++ b/test/jdk/tools/jpackage/windows/WinConsoleTest.java
@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+import java.nio.file.Path;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.HelloApp;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Annotations.Parameter;
+
+/*
+ * @test
+ * @summary jpackage with --win-console
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @requires (os.family == "windows")
+ * @compile -Xlint:all -Werror WinConsoleTest.java
+ *
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
+ *  --jpt-run=WinConsoleTest
+ *
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=WinConsoleTest
+ */
+public class WinConsoleTest {
+
+    @Test
+    @Parameter("true")
+    @Parameter("false")
+    public static void test(boolean withWinConsole) throws IOException {
+        JPackageCommand cmd = JPackageCommand.helloAppImage();
+        if (!withWinConsole) {
+            cmd.removeArgument("--win-console");
+        }
+        cmd.executeAndAssertHelloAppImageCreated();
+        checkSubsystem(cmd.appLauncherPath(), withWinConsole);
+
+        // Run launcher with a number of arguments to make sure they go through
+        // regardless the launcher has or doesn't have console.
+        HelloApp.executeLauncherAndVerifyOutput(cmd, "a", "b", "c");
+    }
+
+    private static void checkSubsystem(Path path, boolean isConsole) throws
+            IOException {
+        final int subsystemGui = 2;
+        final int subsystemConsole = 3;
+        final int bufferSize = 512;
+
+        final int expectedSubsystem = isConsole ? subsystemConsole : subsystemGui;
+
+        try (InputStream inputStream = new FileInputStream(path.toString())) {
+            byte[] bytes = new byte[bufferSize];
+            TKit.assertEquals(bufferSize, inputStream.read(bytes),
+                    String.format("Check %d bytes were read from %s file",
+                            bufferSize, path));
+
+            // Check PE header for console or Win GUI app.
+            // https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ns-winnt-_image_nt_headers
+            for (int i = 0; i < (bytes.length - 4); i++) {
+                if (bytes[i] == 0x50 && bytes[i + 1] == 0x45
+                        && bytes[i + 2] == 0x0 && bytes[i + 3] == 0x0) {
+
+                    // Signature, File Header and subsystem offset.
+                    i = i + 4 + 20 + 68;
+                    byte subsystem = bytes[i];
+                    TKit.assertEquals(expectedSubsystem, subsystem,
+                            String.format("Check subsystem of PE [%s] file",
+                                    path));
+                    return;
+                }
+            }
+        }
+
+        TKit.assertUnexpected(String.format(
+                "Subsystem not found in PE header of [%s] file", path));
+    }
+}