Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MRI-Binding: Catch exceptions in '_load' implementations

This commit is contained in:
Jonas Kulla 2013-10-15 05:12:20 +02:00
parent 36b904ede3
commit 26bc4842c0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binding-mri/binding-util.h
View File

@ -155,6 +155,9 @@ _rb_define_module_function(VALUE module, const char *name, RubyMethod func)
rb_define_module_function(module, name, RUBY_METHOD_FUNC(func), -1); rb_define_module_function(module, name, RUBY_METHOD_FUNC(func), -1);
} }
#define GUARD_EXC(exp) \
{ try { exp } catch (const Exception &exc) { raiseRbExc(exc); } }
template<class C> template<class C>
static inline VALUE static inline VALUE
objectLoad(int argc, VALUE *argv, VALUE self, rb_data_type_struct &type) objectLoad(int argc, VALUE *argv, VALUE self, rb_data_type_struct &type)
@ -165,7 +168,9 @@ objectLoad(int argc, VALUE *argv, VALUE self, rb_data_type_struct &type)
VALUE obj = rb_obj_alloc(self); VALUE obj = rb_obj_alloc(self);
C *c = C::deserialize(data, dataLen); C *c;
GUARD_EXC( c = C::deserialize(data, dataLen); );
setPrivateData(obj, c, type); setPrivateData(obj, c, type);
@ -294,8 +299,5 @@ rb_bool_new(bool value)
_rb_define_method(klass, prop_name_s "=", Klass##Set##PropName); \ _rb_define_method(klass, prop_name_s "=", Klass##Set##PropName); \
} }
#define GUARD_EXC(exp) \
{ try { exp } catch (const Exception &exc) { raiseRbExc(exc); } }
#endif // BINDING_UTIL_H #endif // BINDING_UTIL_H