avoid NPE in to AbsolutePath and toRealPath if file applies to extract filter but does not exits

Author: tomasstupka

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

@@ -151,6 +151,7 @@ public void toRealPath() throws Exception {
             assertEquals(VFS_MOUNT_POINT + File.separator + "SomeFile", fs.toRealPath(Path.of(VFS_MOUNT_POINT + File.separator + "SomeFile")).toString());
             // check to be extracted file
             checkExtractedFile(fs.toRealPath(Path.of(VFS_MOUNT_POINT + File.separator + "extractme")), new String[]{"text1", "text2"});
+            assertEquals(VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme", fs.toRealPath(Path.of(VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme")).toString());
         }
 
         // from real FS
@@ -173,6 +174,7 @@ public void toAbsolutePath() throws Exception {
             // check to be extracted file
             checkExtractedFile(fs.toAbsolutePath(Path.of(VFS_MOUNT_POINT + File.separator + "extractme")), new String[]{"text1", "text2"});
             checkExtractedFile(fs.toAbsolutePath(Path.of(VFS_MOUNT_POINT + File.separator + "dir1/extractme")), null);
+            assertEquals(VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme", fs.toAbsolutePath(Path.of(VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme")).toString());
         }
 
         // from real FS
@@ -213,6 +215,9 @@ public void parseStringPath(BiFunction<FileSystem, String, Path> parsePath) thro
             p = parsePath.apply(fs, VFS_MOUNT_POINT + File.separator + "dir1/extractme");
             assertFalse(Files.exists(p));
             assertEquals(Path.of(VFS_MOUNT_POINT + File.separator + "dir1/extractme"), p);
+            p = parsePath.apply(fs, VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme");
+            assertFalse(Files.exists(p));
+            assertEquals(Path.of(VFS_MOUNT_POINT + File.separator + "does-not-exist/extractme"), p);
         }
 
         // from real FS
@@ -260,6 +265,13 @@ public void checkAccess() throws IOException {
                                 return null;
                             },
                             "should not be able to access a file which does not exist in VFS");
+            checkException(
+                            NoSuchFileException.class,
+                            () -> {
+                                fs.checkAccess(Path.of(VFS_MOUNT_POINT + File.separator + "does-not-exits/extractme"), Set.of(AccessMode.READ));
+                                return null;
+                            },
+                            "should not be able to access a file which does not exist in VFS");
         }
 
         // from real FS

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VirtualFileSystem.java

@@ -595,7 +595,8 @@ private Path extractPath(Path path, boolean extractLibsDir) {
              */
             BaseEntry entry = getEntry(path);
             if (entry == null) {
-                severe("no entry for '%s'", path);
+                warn("no entry for '%s'", path);
+                return null;
             }
             Path relPath = mountPoint.relativize(Paths.get(entry.getPlatformPath()));
 
@@ -968,6 +969,10 @@ public Path toAbsolutePath(Path path) {
         Path result = path;
         if (pathIsInVFS && shouldExtract(path)) {
             result = getExtractedPath(path);
+            if (result == null) {
+                finer("VFS.toAbsolutePath could not extract '%s'", path);
+                result = path;
+            }
         }
         Path ret = toAbsolutePathInternal(result);
         finer("VFS.toAbsolutePath '%s' -> '%s'", path, ret);
@@ -992,6 +997,10 @@ public Path toRealPath(Path path, LinkOption... linkOptions) throws IOException
         Path result = path;
         if (pathIsInVFS && shouldExtract(path)) {
             result = getExtractedPath(path);
+            if (result == null) {
+                finer("VFS.toRealPath could not extract '%s'", path);
+                result = path;
+            }
         }
         Path ret = result.normalize();
         finer("VFS.toRealPath '%s' -> '%s'", path, ret);
@@ -1048,12 +1057,6 @@ private static void warn(String msgFormat, Object... args) {
         }
     }
 
-    private static void info(String msgFormat, Object... args) {
-        if (LOGGER.isLoggable(Level.INFO)) {
-            LOGGER.log(Level.INFO, String.format(msgFormat, args));
-        }
-    }
-
     private static void fine(String msgFormat, Object... args) {
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.log(Level.FINE, String.format(msgFormat, args));
@@ -1072,9 +1075,4 @@ private static void finest(String msgFormat, Object... args) {
         }
     }
 
-    private static void severe(String msgFormat, Object... args) {
-        if (LOGGER.isLoggable(Level.SEVERE)) {
-            LOGGER.log(Level.SEVERE, String.format(msgFormat, args));
-        }
-    }
 }