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/beans/beancontext/BeanContextSupport/AddRemove.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright Amazon.com Inc. 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.beans.beancontext.BeanContextSupport;
+
+/**
+ * @test
+ * @bug 8238170
+ * @summary Some basic tests
+ */
+public final class AddRemove {
+
+    public static void main(String[] args) {
+        BeanContextSupport bcs = new BeanContextSupport();
+        if (!bcs.isEmpty()) {
+            throw new RuntimeException("The new context is not empty");
+        }
+        Object child1 = new Object();
+        bcs.add(child1);
+        if (bcs.size() != 1) {
+            throw new RuntimeException("Expected one element");
+        }
+        Object child2 = new Object();
+        bcs.add(child2);
+        if (bcs.size() != 2) {
+            throw new RuntimeException("Expected two elements");
+        }
+        bcs.remove(child1);
+        if (bcs.size() != 1) {
+            throw new RuntimeException("Expected one element");
+        }
+        if (bcs.toArray()[0] != child2) {
+            throw new RuntimeException("Wrong element");
+        }
+        bcs.remove(child2);
+        if (!bcs.isEmpty()) {
+            throw new RuntimeException("The context is not empty");
+        }
+    }
+}

test/jdk/java/beans/beancontext/BeanContextSupport/NotificationDeadlock.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright Amazon.com Inc. 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.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.beancontext.BeanContextSupport;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @test
+ * @bug 8238170
+ * @summary Test for a possible deadlock in the BeanContextSupport
+ */
+public final class NotificationDeadlock {
+
+    private static volatile long endtime;
+
+    public static void main(String[] args) throws Exception {
+        // Will run the test no more than 5 seconds
+        endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
+
+        BeanContextSupport bcs = new BeanContextSupport();
+        Thread add = new Thread(() -> {
+            while (!isComplete()) {
+                bcs.add(bcs);
+            }
+        });
+        Thread remove = new Thread(() -> {
+            while (!isComplete()) {
+                Object[] objects = bcs.toArray();
+                for (Object object : objects) {
+                    bcs.remove(object);
+                }
+            }
+        });
+        Thread props = new Thread(() -> {
+            while (!isComplete()) {
+                Object[] objects = bcs.toArray();
+                for (Object object : objects) {
+                    PropertyChangeEvent beanContext = new PropertyChangeEvent(
+                            object, "beanContext", object, null);
+                    try {
+                        bcs.vetoableChange(beanContext);
+                    } catch (PropertyVetoException ignore) {
+                    }
+                    bcs.propertyChange(beanContext);
+                }
+            }
+        });
+        add.start();
+        remove.start();
+        props.start();
+        add.join();
+        remove.join();
+        props.join();
+    }
+
+    private static boolean isComplete() {
+        return endtime - System.nanoTime() < 0;
+    }
+}

test/jdk/java/beans/beancontext/Test4132698.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1999, 2007, 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 4132698
+ * @summary Tests that changes is not null when creating a BeanContextMembershipEvent
+ * @author Janet Koenig
+ */
+
+import java.beans.beancontext.BeanContext;
+import java.beans.beancontext.BeanContextMembershipEvent;
+import java.beans.beancontext.BeanContextSupport;
+
+public class Test4132698 extends BeanContextMembershipEvent {
+    public static void main(String[] args) throws Exception {
+        BeanContextSupport bcs = new BeanContextSupport();
+        try {
+            new Test4132698(bcs, null);
+        }
+        catch (NullPointerException exception) {
+            return; // expected null pointer exception
+        }
+        catch (Exception exception) {
+            throw new Error("Should have caught NullPointerException but caught something else.", exception);
+        }
+        // If test got this far then expected exception wasn't thrown.
+        throw new Error("Failure to catch null changes argument.");
+    }
+
+    public Test4132698(BeanContext bc, Object[] objects) {
+        super(bc, objects);
+    }
+}

test/jdk/java/beans/beancontext/Test4233980.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002, 2007, 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 4233980
+ * @summary Tests for BeanContext bug
+ * @author Mark Davidson
+ */
+
+import java.beans.beancontext.BeanContextChildSupport;
+import java.beans.beancontext.BeanContextSupport;
+
+public class Test4233980 {
+    public static void main(String[] args) {
+        BeanContextSupport context = new BeanContextSupport(); // The BeanContext
+        BeanContextChildSupport bean = new BeanContextChildSupport(); // The JavaBean
+        // add the bean to the context
+        context.add(bean);
+        try {
+            context.getResourceAsStream("Readme.txt", bean);
+        }
+        catch (Exception exception) {
+            throw new Error("unexpected exception", exception);
+        }
+    }
+}

test/jdk/java/beans/beancontext/Test4328406.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2002, 2007, 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 4328406
+ * @summary Tests NPE while removing a BeanContextServices
+ * @author Mark Davidson
+ */
+
+import java.beans.beancontext.BeanContextChild;
+import java.beans.beancontext.BeanContextChildSupport;
+import java.beans.beancontext.BeanContextServiceProvider;
+import java.beans.beancontext.BeanContextServices;
+import java.beans.beancontext.BeanContextServicesSupport;
+import java.util.Iterator;
+
+public class Test4328406 {
+    public static void main(String[] args) {
+        for (int i = 0; i < 10; i++) {
+            BeanContextServices container = new BeanContextServicesSupport();
+            BeanContextChild ms1 = new MyService1();
+            BeanContextServices ms2 = new MyService2();
+            BeanContextChild mb = new MyBean();
+
+            container.add(ms1);
+            container.add(ms2);
+            ms2.add(mb);
+
+            // exception thrown here
+            container.remove(ms2);
+        }
+    }
+}
+
+class MyService1 extends BeanContextChildSupport implements BeanContextServiceProvider {
+    protected void initializeBeanContextResources() {
+        super.initializeBeanContextResources();
+
+        BeanContextServices bcs = (BeanContextServices) getBeanContext();
+        bcs.addService(this.getClass(), this);
+    }
+
+    public Object getService(BeanContextServices bcs, Object requestor, Class serviceClass, Object serviceSelector) {
+        return this;
+    }
+
+    public void releaseService(BeanContextServices bcs, Object requestor, Object
+            service) {
+    }
+
+    public Iterator getCurrentServiceSelectors(BeanContextServices bcs, Class serviceClass) {
+        return null;
+    }
+}
+
+class MyService2 extends BeanContextServicesSupport implements BeanContextServiceProvider {
+    protected void initializeBeanContextResources() {
+        super.initializeBeanContextResources();
+
+        BeanContextServicesSupport bcs = (BeanContextServicesSupport) getBeanContext();
+        try {
+            bcs.getService(this, this, MyService1.class, null, this);
+        }
+        catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        bcs.addService(this.getClass(), this);
+    }
+
+    protected void releaseBeanContextResources() {
+        super.releaseBeanContextResources();
+
+        BeanContextServices bcs = (BeanContextServices) getBeanContext();
+        bcs.revokeService(this.getClass(), this, true);
+    }
+
+    public Object getService(BeanContextServices bcs, Object requestor, Class serviceClass, Object serviceSelector) {
+        return this;
+    }
+
+    public void releaseService(BeanContextServices bcs, Object requestor, Object service) {
+    }
+
+    public Iterator getCurrentServiceSelectors(BeanContextServices bcs, Class serviceClass) {
+        return null;
+    }
+}
+
+class MyBean extends BeanContextChildSupport {
+    protected void initializeBeanContextResources() {
+        super.initializeBeanContextResources();
+
+        BeanContextServices bcs = (BeanContextServices) getBeanContext();
+        try {
+            bcs.getService(this, this, MyService1.class, null, this);
+        }
+        catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        try {
+            bcs.getService(this, this, MyService2.class, null, this);
+        }
+        catch (Exception exception) {
+            exception.printStackTrace();
+        }
+    }
+}