# HG changeset patch
# User bpb
# Date 1563398677 25200
# Node ID 978350939943587d75e0b37bd93b71c0cafb0860
# Parent  070ffafc42945903af773f1a19f501598cc7f8d7
8067801: Enforce null check for underlying I/O streams
Reviewed-by: lancea

diff -r 070ffafc4294 -r 978350939943 src/java.base/share/classes/java/io/FilterInputStream.java
--- a/src/java.base/share/classes/java/io/FilterInputStream.java	Wed Jul 17 14:24:24 2019 -0700
+++ b/src/java.base/share/classes/java/io/FilterInputStream.java	Wed Jul 17 14:24:37 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -59,6 +59,9 @@
      *          this instance is to be created without an underlying stream.
      */
     protected FilterInputStream(InputStream in) {
+        if (in == null) {
+            throw new NullPointerException();
+        }
         this.in = in;
     }
 
diff -r 070ffafc4294 -r 978350939943 src/java.base/share/classes/java/io/FilterOutputStream.java
--- a/src/java.base/share/classes/java/io/FilterOutputStream.java	Wed Jul 17 14:24:24 2019 -0700
+++ b/src/java.base/share/classes/java/io/FilterOutputStream.java	Wed Jul 17 14:24:37 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -67,6 +67,10 @@
      *                created without an underlying stream.
      */
     public FilterOutputStream(OutputStream out) {
+        if (out == null) {
+            throw new NullPointerException();
+        }
+
         this.out = out;
     }
 
diff -r 070ffafc4294 -r 978350939943 test/jdk/java/io/NPETests.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/io/NPETests.java	Wed Jul 17 14:24:37 2019 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019, 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.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/*
+ * @test
+ * @bug 8067801
+ * @run testng NPETests
+ * @summary Ensure constructors throw NPE when passed a null stream
+ */
+public class NPETests {
+
+    @Test
+    public static void BufferedInputStreamConstructor() {
+        assertThrows(NullPointerException.class,
+            () -> new BufferedInputStream(null));
+        assertThrows(NullPointerException.class,
+            () -> new BufferedInputStream(null, 42));
+    }
+
+    @Test
+    public static void DataInputStreamConstructor() {
+        assertThrows(NullPointerException.class,
+            () -> new DataInputStream(null));
+    }
+
+    @Test
+    public static void PushbackInputStreamConstructor() {
+        assertThrows(NullPointerException.class,
+            () -> new PushbackInputStream(null));
+        assertThrows(NullPointerException.class,
+            () -> new PushbackInputStream(null, 42));
+    }
+
+    @Test
+    public static void BufferedOutputStreamConstructor() {
+        assertThrows(NullPointerException.class,
+            () -> new BufferedOutputStream(null));
+        assertThrows(NullPointerException.class,
+            () -> new BufferedOutputStream(null, 42));
+    }
+
+    @Test
+    public static void DataOutputStreamConstructor() {
+        assertThrows(NullPointerException.class,
+            () -> new DataOutputStream(null));
+    }
+}