pike.git/ src/ interpret.h

2006-03-17

2006-03-17 17:55:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 6deaa348cfe16acf1e7791a9a5f2eff1679efd92 (14 lines) (+10/-4) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed SAFE_APPLY_MASTER() for functions not present in the master. Fixes "Invalid function offset."

Rev: src/interpret.c:1.375
Rev: src/interpret.h:1.166

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: interpret.h,v 1.165 2006/02/27 12:07:10 mast Exp $ + || $Id: interpret.h,v 1.166 2006/03/17 17:55:45 grubba Exp $   */      #ifndef INTERPRET_H
624:    fun_=find_identifier(FUN,master_ob->prog); \    master_cnt = master_ob->prog->id; \    } \ +  if (fun_ >= 0) { \    apply_low(master_ob, fun_, ARGS); \ -  +  } else { \ +  Pike_error("Cannot call undefined function \"%s\" in master.\n", FUN); \ +  } \   }while(0)      #define SAFE_APPLY_MASTER(FUN,ARGS) \
636:    fun_=find_identifier(FUN,master_ob->prog); \    master_cnt = master_ob->prog->id; \    } \ -  safe_apply_low2(master_ob, fun_, ARGS, 1); \ +  safe_apply_low2(master_ob, fun_, ARGS, FUN); \   }while(0)      #define SAFE_APPLY_HANDLER(FUN, HANDLER, COMPAT, ARGS) do { \
727:   PMOD_EXPORT void call_handle_error(void);   PMOD_EXPORT int apply_low_safe_and_stupid(struct object *o, INT32 offset);   PMOD_EXPORT void safe_apply_low(struct object *o,int fun,int args); - PMOD_EXPORT void safe_apply_low2(struct object *o,int fun,int args, int handle_errors); + PMOD_EXPORT void safe_apply_low2(struct object *o,int fun,int args, +  char *fun_name);   PMOD_EXPORT void safe_apply(struct object *o, const char *fun ,INT32 args);   PMOD_EXPORT int low_unsafe_apply_handler(const char *fun,    struct object *handler,