(Fsignal): Handle case that backtrace_list is null.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5666a79c04dfa7d85bafc07b9d21f9a6fb3ed2fe..7f121c72f1ebc3fa16f092798882f32e941526dd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-07  Gerd Moellmann  <gerd@gnu.org>
+
+       * eval.c (Fsignal): Handle case that backtrace_list is null.
+
 2000-07-07  Kenichi Handa  <handa@etl.go.jp>
 
        * ccl.c (Fccl_execute): Typo fixed.

diff --git a/src/eval.c b/src/eval.c
index 56842ac99f3511fb0e52daf7530129a588507758..da63f9833a1651c3c4c2dffb77498cfb0303c571 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1328,10 +1328,15 @@ See also the function `condition-case'.")
   /* Remember from where signal was called.  Skip over the frame for
      `signal' itself.  If a frame for `error' follows, skip that,
      too.  */
-  bp = backtrace_list->next;
-  if (bp && bp->function && EQ (*bp->function, Qerror))
-    bp = bp->next;
-  Vsignaling_function = bp && bp->function ? *bp->function : Qnil;
+  Vsignaling_function = Qnil;
+  if (backtrace_list)
+    {
+      bp = backtrace_list->next;
+      if (bp && bp->function && EQ (*bp->function, Qerror))
+       bp = bp->next;
+      if (bp && bp->function)
+       Vsignaling_function = *bp->function;
+    }
 
   for (; handlerlist; handlerlist = handlerlist->next)
     {