8254876: (fs) NullPointerException not thrown when first argument to …

…Path.of or Paths.get is null
openjdk · Nov 2, 2020 · 7230ae9 · 7230ae9
1 parent 05bcd67
commit 7230ae9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
@@ -261,6 +261,9 @@ public final Path getPath(String first, String... more) {
         if (more.length == 0) {
             path = first;
         } else {
+            if (first == null) {
+                throw new NullPointerException();
+            }
             StringBuilder sb = new StringBuilder();
             sb.append(first);
             for (String segment: more) {

diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, 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
@@ -215,6 +215,9 @@ public final Path getPath(String first, String... more) {
         if (more.length == 0) {
             path = first;
         } else {
+            if (first == null) {
+                throw new NullPointerException();
+            }
             StringBuilder sb = new StringBuilder();
             sb.append(first);
             for (String segment: more) {

diff --git a/test/jdk/java/nio/file/Path/PathOps.java b/test/jdk/java/nio/file/Path/PathOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2020, 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
@@ -2042,6 +2042,12 @@ static void doUnixTests() {
     static void npes() {
         header("NullPointerException");
 
+        try {
+            Path.of(null, "foo");
+            throw new RuntimeException("NullPointerException not thrown");
+        } catch (NullPointerException npe) {
+        }
+
         Path path = FileSystems.getDefault().getPath("foo");
 
         try {