pike.git/ src/ program.c

2005-05-30

2005-05-30 12:43:04 by Martin Stjernholm <mast@lysator.liu.se>

• 9a121714760698b08928a30a8e1dc1a830066780 (17 lines) (+14/-3) ^{[ Show | Annotate ]}
  Branch: 7.4

Some damage control in a severely broken part of the resolver mess:
Now we at least get a warning if resolv() throws an error in pass 1 in
rtldebug mode. Also fixed a temporary leak of the backtrace in this
case.

Rev: src/program.c:1.496

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: program.c,v 1.495 2005/05/26 12:00:56 grubba Exp $ + || $Id: program.c,v 1.496 2005/05/30 12:43:04 mast Exp $   */      #include "global.h" - RCSID("$Id: program.c,v 1.495 2005/05/26 12:00:56 grubba Exp $"); + RCSID("$Id: program.c,v 1.496 2005/05/30 12:43:04 mast Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
1114:    }    pop_stack();    } -  else +  else {    if(Pike_compiler->compiler_pass==2) {    if (throw_value.type == T_STRING && !throw_value.u.string->size_shift) {    yyerror(throw_value.u.string->str);
1137:    free_svalue(&thrown);    }    } +  else { +  struct svalue thrown = throw_value; +  throw_value.type = T_INT; + #ifdef PIKE_DEBUG +  yywarning ("Ignoring resolv() exception in pass 1:"); +  yy_describe_exception (&thrown, 1); + #endif +  free_svalue (&thrown);    } -  +  } +  }    END_CYCLIC();    if(ret) return ret;    }