From 090a072fc19d89419186471ba7e5249eb04a7070 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 7 Jul 2000 10:23:51 +0000 Subject: [PATCH] (Fsignal): Handle case that backtrace_list is null. --- src/ChangeLog | 4 ++++ src/eval.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5666a79c04d..7f121c72f1e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2000-07-07 Gerd Moellmann + + * eval.c (Fsignal): Handle case that backtrace_list is null. + 2000-07-07 Kenichi Handa * ccl.c (Fccl_execute): Typo fixed. diff --git a/src/eval.c b/src/eval.c index 56842ac99f3..da63f9833a1 100644 --- 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) { -- 2.39.2