Skip to content

M
mruby
Commit 1e87dfdf authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

The stack may be reallocated in the func call; fix #3560

parent 8d9d7c92
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/vm.c
View file @ 1e87dfdf
...@@ -1449,13 +1449,16 @@ RETRY_TRY_BLOCK: ...@@ -1449,13 +1449,16 @@ RETRY_TRY_BLOCK:
mrb->c->stack[0] = recv; mrb->c->stack[0] = recv;
if (MRB_PROC_CFUNC_P(m)) { if (MRB_PROC_CFUNC_P(m)) {
mrb_value v;
if (n == CALL_MAXARGS) { if (n == CALL_MAXARGS) {
ci->nregs = 3; ci->nregs = 3;
} }
else { else {
ci->nregs = n + 2; ci->nregs = n + 2;
} }
mrb->c->stack[0] = m->body.func(mrb, recv); v = m->body.func(mrb, recv);
mrb->c->stack[0] = v;
mrb_gc_arena_restore(mrb, ai); mrb_gc_arena_restore(mrb, ai);
if (mrb->exc) goto L_RAISE; if (mrb->exc) goto L_RAISE;
/* pop stackpos */ /* pop stackpos */
...@@ -1862,7 +1865,8 @@ RETRY_TRY_BLOCK: ...@@ -1862,7 +1865,8 @@ RETRY_TRY_BLOCK:
value_move(mrb->c->stack, &regs[a], ci->argc+1); value_move(mrb->c->stack, &regs[a], ci->argc+1);
if (MRB_PROC_CFUNC_P(m)) { if (MRB_PROC_CFUNC_P(m)) {
mrb->c->stack[0] = m->body.func(mrb, recv); mrb_value v = m->body.func(mrb, recv);
mrb->c->stack[0] = v;
mrb_gc_arena_restore(mrb, ai); mrb_gc_arena_restore(mrb, ai);
goto L_RETURN; goto L_RETURN;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment