# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1523421834 14400
# Node ID 2815f3257c9a90431dd8e2bd36600b40b442f556
# Parent  22522ea137b47f1b94015fdac2dd7228f4212a6e# Parent  cbe53b5ea5ce2eb2444392e09be2967f73b4253b
maint: Merge stable to default.

diff -r 22522ea137b4 -r 2815f3257c9a libinterp/parse-tree/oct-parse.in.yy
--- a/libinterp/parse-tree/oct-parse.in.yy	Wed Apr 11 00:27:42 2018 -0400
+++ b/libinterp/parse-tree/oct-parse.in.yy	Wed Apr 11 00:43:54 2018 -0400
@@ -4753,9 +4753,11 @@
         octave_function *tmpfcn
           = dyn_loader.load_oct (nm, file, relative_lookup);
 
-        tmpfcn->stash_package_name (package_name);
-
-        retval = octave_value (tmpfcn);
+        if (tmpfcn)
+          {
+            tmpfcn->stash_package_name (package_name);
+            retval = octave_value (tmpfcn);
+          }
       }
     else if (len > 4 && file.substr (len-4, len-1) == ".mex")
       {