admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix instance_exec and class_exec to avoid crash on indirect calls.

Browse Source 
Thank you @shuujii to additional report on #4973
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-04-22 16:48:33 +09:00
parent ab508e1e7f
commit d3a02a297f
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-class-ext/src/class.c
+6 -1
View File
@@ -43,10 +43,15 @@ mrb_mod_module_exec(mrb_state *mrb, mrb_value self)
const mrb_value *argv;
mrb_int argc;
mrb_value blk;
struct RClass *c;
mrb_get_args(mrb, "*&!", &argv, &argc, &blk);
mrb->c->ci->target_class = mrb_class_ptr(self);
c = mrb_class_ptr(self);
if (mrb->c->ci->acc < 0) {
return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
}
mrb->c->ci->target_class = c;
return mrb_yield_cont(mrb, blk, self, argc, argv);
}
mrbgems/mruby-object-ext/src/object.c
+3 -12
View File
@@ -101,18 +101,9 @@ mrb_obj_instance_exec(mrb_state *mrb, mrb_value self)
struct RClass *c;
mrb_get_args(mrb, "*&!", &argv, &argc, &blk);
switch (mrb_type(self)) {
case MRB_TT_SYMBOL:
case MRB_TT_FIXNUM:
#ifndef MRB_WITHOUT_FLOAT
case MRB_TT_FLOAT:
#endif
c = NULL;
break;
default:
c = mrb_class_ptr(mrb_singleton_class(mrb, self));
break;
c = mrb_singleton_class_ptr(mrb, self);
if (mrb->c->ci->acc < 0) {
return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
}
mrb->c->ci->target_class = c;
return mrb_yield_cont(mrb, blk, self, argc, argv);