(no commit message)

[gacela.git] / gacela_misc.lisp

diff --git a/gacela_misc.lisp b/gacela_misc.lisp
index 16e8ab83833ab701d59ddf85ddeda2cc88a6ff72..d9f38daa5ef4aedafbc7c3f8dfc1498db1efb560 100755 (executable)
--- a/gacela_misc.lisp
+++ b/gacela_misc.lisp
@@ -69,13 +69,16 @@
          (power 1 n)))
 
 (defmacro secured-eval (form &optional output-stream)
-  `(let ((error-handler #'si::universal-error-handler)
-        (result-eval))
-     (defun si::universal-error-handler (error-name correctable function-name continue-format-string error-format-string &rest args)
-       ,(when output-stream `(format ,output-stream error-format-string)))
-     (setq result-eval (eval ,form))
-     (setf (symbol-function 'si::universal-error-handler) error-handler)
-     result-eval))
+  (let ((error-handler #'si::universal-error-handler))
+    `(block secure
+       (defun si::universal-error-handler (error-name correctable function-name continue-format-string error-format-string &rest args)
+        ,(when output-stream `(format ,output-stream error-format-string))
+        (setf (symbol-function 'si::universal-error-handler) ,error-handler)
+        (return-from secure))
+       (let (result-eval)
+        (setq result-eval (eval ,form))
+        (setf (symbol-function 'si::universal-error-handler) ,error-handler)
+        result-eval))))
 
 ;Geometry
 (defun dotp (dot)