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

Fixed the condition in mrb_funcall_with_block; fix #4389

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-04-23 15:30:10 +09:00
parent 7cf1bc39a7
commit e9f3902ab5
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+6 -7
View File
@@ -490,22 +490,21 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
if (mrb->c->stbase <= argv && argv < mrb->c->stend) {
voff = argv - mrb->c->stbase;
}
if (MRB_METHOD_CFUNC_P(m)) {
mrb_stack_extend(mrb, argc + 2);
}
else if (argc >= CALL_MAXARGS) {
if (argc >= CALL_MAXARGS) {
mrb_value args = mrb_ary_new_from_values(mrb, argc, argv);
mrb_stack_extend(mrb, 3);
mrb->c->stack[1] = args;
ci->argc = -1;
argc = 1;
}
else if (MRB_METHOD_PROC_P(m)) {
mrb_stack_extend(mrb, argc + 2);
if (MRB_METHOD_PROC_P(m)) {
struct RProc *p = MRB_METHOD_PROC(m);
ci->proc = p;
mrb_stack_extend(mrb, p->body.irep->nregs + argc);
if (!MRB_PROC_CFUNC_P(p)) {
mrb_stack_extend(mrb, p->body.irep->nregs + argc);
}
}
if (voff >= 0) {
argv = mrb->c->stbase + voff;