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/langtools/tools/javac/patterns/LambdaCannotCapturePatternVariables.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2021, 2022, 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 8267610 8269738
+ * @summary LambdaToMethod cannot capture pattern variables. So the TransPatterns should
+ *          transform the pattern variables and symbols to normal variables and symbols.
+ */
+
+import java.util.function.Supplier;
+
+public class LambdaCannotCapturePatternVariables {
+
+    static Number num1 = 1;
+    static Number num2 = null;
+    static Number staticNum1 = (num1 instanceof Integer i) ? ((Supplier<Integer>) () -> i).get() : null;
+    static Number staticNum2 = (num2 instanceof Integer i) ? ((Supplier<Integer>) () -> i).get() : null;
+    Number instanceNum1 = (num1 instanceof Integer i) ? ((Supplier<Integer>) () -> i).get() : null;
+    Number instanceNum2 = (num2 instanceof Integer i) ? ((Supplier<Integer>) () -> i).get() : null;
+
+    public static void main(String[] args) {
+        var testVar = new LambdaCannotCapturePatternVariables();
+        testVar.testInstanceOfPatternVariable(Integer.valueOf(1));
+        testVar.testSwitchPatternVariable(Integer.valueOf(1));
+        testVar.test(Integer.valueOf(1));
+        assertTrue(staticNum1 != null, "staticNum1 is null unexpectedly");
+        assertTrue(staticNum2 == null, "staticNum1 is not null unexpectedly");
+        assertTrue(testVar.instanceNum1 != null, "instanceNum1 is null unexpectedly");
+        assertTrue(testVar.instanceNum2 == null, "instanceNum2 is not null unexpectedly");
+        assertTrue(staticNum1.intValue() == 1, "staticNum1.intValue() is not equal to 1");
+        assertTrue(testVar.instanceNum1.intValue() == 1, "instanceNum1.intValue() is not equal to 1");
+    }
+
+    public Integer testInstanceOfPatternVariable(Object x) {
+        if(x instanceof Number y) {
+            return ((Supplier<Integer>) (() -> {
+                return ((y instanceof Integer z) ? z : 1);
+            })).get();
+        }
+        return null;
+    }
+
+    public Integer testSwitchPatternVariable(Object x) {
+        switch (x) {
+            case Number n: {
+                return ((Supplier<Integer>) (() -> {
+                    return ((n instanceof Integer i) ? i : 1);
+                })).get();
+            }
+            default: return null;
+        }
+    }
+
+    // Provided by the user
+    public Integer test(Object x) {
+        Integer bar = 1;
+        return ((x instanceof Number y) ?
+                ((Supplier<Integer>) (() -> {
+                    return ((y instanceof Integer z) ? z : bar);
+                })).get() : bar);
+    }
+
+    static void assertTrue(boolean cond, String info) {
+        if (!cond)
+            throw new AssertionError(info);
+    }
+}