(Fsignal): Handle case that backtrace_list is null.

This commit is contained in:
Gerd Moellmann 2000-07-07 10:23:51 +00:00
parent d7e1fe1f9e
commit 090a072fc1
2 changed files with 13 additions and 4 deletions

View file

@ -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.

View file

@ -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)
{