Changeset 15038

Timestamp:

06/03/17 04:36:02 (6 years ago)

Author:

Mark Evenson

Message:

Fix NPE if directory can't be accessed.
(Olof-Joachim Frahm)

C.f. <​http://abcl.org/trac/ticket/233>.

From
<​https://github.com/Ferada/abcl/commit/bdce7703a044b9ce5b02f3af87af309395e2f30e>.

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1668 +1668 @@
                     try {
                         File[] files = f.listFiles();
+                        if (files == null) {
+                            return error(new FileError("Unable to list directory "
+                                                       + pathname.princToString() + ".",
+                                                       pathname));
+                        }
                         for (int i = files.length; i-- > 0;) {
                             File file = files[i];