pike.git/ src/ interpret.c

2001-06-08

2001-06-08 12:23:01 by Martin Stjernholm <mast@lysator.liu.se>

• a2988f37cbf9a32ba37f58e7f57a258111dc9d97 (13 lines) (+10/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Zap throw_value in call_handle_error, so that the backtrace isn't left
around after an uncatched exception has been handled.

Rev: src/interpret.c:1.201

5:   \*/   /**/   #include "global.h" - RCSID("$Id: interpret.c,v 1.200 2001/05/24 22:39:00 hubbe Exp $"); + RCSID("$Id: interpret.c,v 1.201 2001/06/08 12:23:01 mast Exp $");   #include "interpret.h"   #include "object.h"   #include "program.h"
1494:    UNSETJMP(tmp);    Pike_fp->expendible=expendible;    Pike_fp->flags=flags; +  destruct_objects_to_destruct();    return 0;    }else{    struct svalue **save_mark_sp=Pike_mark_sp;
1534:    Pike_interpreter.svalue_stack_margin = 0;    Pike_interpreter.c_stack_margin = 0;    SET_ONERROR(tmp,exit_on_error,"Error in handle_error in master object!"); -  assign_svalue_no_free(Pike_sp++, & throw_value); +  *(Pike_sp++) = throw_value; +  throw_value.type=T_INT;    APPLY_MASTER("handle_error", 1);    pop_stack();    UNSET_ONERROR(tmp);
1542:    Pike_interpreter.c_stack_margin = C_STACK_MARGIN;    t_flag = old_t_flag;    } +  else { +  free_svalue(&throw_value); +  throw_value.type=T_INT;    } -  + }      PMOD_EXPORT int apply_low_safe_and_stupid(struct object *o, INT32 offset)   {
1599:    throw_value.type=T_INT;    if(SETJMP(recovery))    { -  if(throw_value.type == T_ARRAY) +  if(throw_value.type != T_INT)    call_handle_error();    Pike_sp->u.integer = 0;    Pike_sp->subtype=NUMBER_NUMBER;