Mercurial > octave

changeset 25207:2815f3257c9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Apr 2018 00:43:54 -0400
parents 22522ea137b4 (current diff) cbe53b5ea5ce (diff)
children 325145377713
files
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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")
       {