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

vm.c (mrb_funcall_with_block): copy argv before prepare_missing(); fix #5704

Browse Source 
Since prepare_missing() may call `missing` method internally.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-05-02 18:59:38 +09:00
parent 651c872a71
commit 23ce122fc2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+6 -8
View File
@@ -527,8 +527,14 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
mrb_stack_extend(mrb, n + argc + 3);
if (argc >= 15) {
ci->stack[n+1] = mrb_ary_new_from_values(mrb, argc, argv);
ci->stack[n+2] = blk;
argc = 15;
}
else {
if (argc > 0)
stack_copy(ci->stack+n+1, argv, argc);
ci->stack[n+argc+1] = blk;
}
if (MRB_METHOD_UNDEF_P(m)) {
uint16_t ac = (uint16_t)argc;
m = prepare_missing(mrb, self, mid, &c, (uint32_t)n, &ac, mrb_nil_value(), 0);
@@ -548,14 +554,6 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
argv = mrb->c->stbase + voff;
}
ci->stack[0] = self;
if (argc < 15) {
if (argc > 0)
stack_copy(ci->stack+1, argv, argc);
ci->stack[argc+1] = blk;
}
else {
ci->stack[2] = blk;
}
if (MRB_METHOD_CFUNC_P(m)) {
ci->cci = CINFO_DIRECT;