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/share/AppLauncherEnvTest.java
+++ b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java
@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2021, 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.io.File;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Executor;
+import static jdk.jpackage.test.HelloApp.configureAndExecute;
+import jdk.jpackage.test.TKit;
+
+/**
+ * Tests values of environment variables altered by jpackage launcher.
+ */
+
+/*
+ * @test
+ * @summary Tests values of environment variables altered by jpackage launcher
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @build AppLauncherEnvTest
+ * @run main/othervm -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=AppLauncherEnvTest
+ */
+public class AppLauncherEnvTest {
+
+    @Test
+    public static void test() throws Exception {
+        final String testAddDirProp = "jpackage.test.AppDir";
+
+        JPackageCommand cmd = JPackageCommand
+                .helloAppImage(TEST_APP_JAVA + "*Hello")
+                .ignoreFakeRuntime()
+                .addArguments("--java-options", "-D" + testAddDirProp
+                        + "=$APPDIR");
+
+        cmd.executeAndAssertImageCreated();
+
+        final String envVarName = envVarName();
+
+        List<String> output = configureAndExecute(0, new Executor()
+                .saveOutput()
+                .setExecutable(cmd.appLauncherPath().toAbsolutePath())
+                .addArguments("--print-env-var=" + envVarName)
+                .addArguments("--print-sys-prop=" + testAddDirProp)
+                .addArguments("--print-sys-prop=" + "java.library.path")).getOutput();
+
+        BiFunction<Integer, String, String> getValue = (idx, name) -> {
+            return  output.get(idx).substring((name + "=").length());
+        };
+
+        final String actualEnvVarValue = getValue.apply(0, envVarName);
+        final String appDir = getValue.apply(1, testAddDirProp);
+
+        final String expectedEnvVarValue = Optional.ofNullable(System.getenv(
+                envVarName)).orElse("") + File.pathSeparator + appDir;
+
+        TKit.assertTextStream(expectedEnvVarValue)
+            .predicate(TKit.isLinux() ? String::endsWith : String::equals)
+            .label(String.format("value of %s env variable", envVarName))
+            .apply(List.of(actualEnvVarValue));
+
+        final String javaLibraryPath = getValue.apply(2, "java.library.path");
+        TKit.assertTrue(
+                List.of(javaLibraryPath.split(File.pathSeparator)).contains(
+                        appDir), String.format(
+                        "Check java.library.path system property [%s] contains app dir [%s]",
+                        javaLibraryPath, appDir));
+    }
+
+    private static String envVarName() {
+        if (TKit.isLinux()) {
+            return "LD_LIBRARY_PATH";
+        } else if (TKit.isWindows()) {
+            return "PATH";
+        } else if (TKit.isOSX()) {
+            return "DYLD_LIBRARY_PATH";
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    private static final Path TEST_APP_JAVA = TKit.TEST_SRC_ROOT.resolve(
+            "apps/PrintEnv.java");
+}