Mercurial > octave-nkf

changeset 18912:d3276190e551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert a0fd65914811 which does not truly fix bug #36067. * variables.cc: Remove try/catch block around safe_symbol_lookup.
author Rik <rik@octave.org>
date Sun, 29 Jun 2014 11:23:06 -0700
parents 1b02bfff39d0
children afab3a2f57e7
files libinterp/corefcn/variables.cc
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/variables.cc	Sun Jun 29 13:58:33 2014 +0200
+++ b/libinterp/corefcn/variables.cc	Sun Jun 29 11:23:06 2014 -0700
@@ -418,12 +418,11 @@
 
   if (search_any || search_builtin)
     {
-      // Require a try block because symbol_lookup will attempt unsafe load
-      // of .oct/.mex file.
-      try
-        { val = safe_symbol_lookup (name); }
-      catch (octave_execution_exception)
-        { }
+      // FIXME: safe_symbol_lookup will attempt unsafe load of .oct/.mex file.
+      // This can cause a segfault.  To catch this would require temporarily
+      // diverting the SIGSEGV exception handler and then restoring it.
+      // See bug #36067.
+      val = safe_symbol_lookup (name);
 
       if (val.is_defined () && val.is_builtin_function ())
         return 5;