Changeset 15458

Timestamp:

10/29/20 16:55:02 (3 years ago)

Author:

Mark Evenson

Message:

Guard against null reference when determing *LOAD-TRUENAME*

File:

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

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

@@ -548 +548 @@
                   // We set *LOAD-TRUENAME* to the argument that a
                   // user would pass to LOAD.
-                  truePathname = (Pathname)probe_file.PROBE_FILE.execute(pathname);
+                  LispObject possibleTruePathname = probe_file.PROBE_FILE.execute(pathname);
+                  if (!possibleTruePathname.equals(NIL)) {
+                    truePathname = (Pathname) possibleTruePathname;
+                  }
                   /*
                   if (truePathname.getDevice().cdr() != NIL ) {