Skip to content

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

Wrong stack adjustment in `ecall()` (f35f975d #3859); fix #3862

parent f3279b41
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/vm.c
View file @ d3e273ba
...@@ -316,6 +316,7 @@ ecall(mrb_state *mrb) ...@@ -316,6 +316,7 @@ ecall(mrb_state *mrb)
ptrdiff_t cioff; ptrdiff_t cioff;
int ai = mrb_gc_arena_save(mrb); int ai = mrb_gc_arena_save(mrb);
int i = --c->eidx; int i = --c->eidx;
int nregs;
if (i<0) return; if (i<0) return;
if (ci - c->cibase > MRB_FUNCALL_DEPTH_MAX) { if (ci - c->cibase > MRB_FUNCALL_DEPTH_MAX) {
...@@ -325,7 +326,7 @@ ecall(mrb_state *mrb) ...@@ -325,7 +326,7 @@ ecall(mrb_state *mrb)
if (!p) return; if (!p) return;
mrb_assert(!MRB_PROC_CFUNC_P(p)); mrb_assert(!MRB_PROC_CFUNC_P(p));
c->ensure[i] = NULL; c->ensure[i] = NULL;
c->stack += ci->proc->body.irep->nregs; nregs = ci->proc->body.irep->nregs;
cioff = ci - c->cibase; cioff = ci - c->cibase;
ci = cipush(mrb); ci = cipush(mrb);
ci->stackent = mrb->c->stack; ci->stackent = mrb->c->stack;
...@@ -335,6 +336,7 @@ ecall(mrb_state *mrb) ...@@ -335,6 +336,7 @@ ecall(mrb_state *mrb)
ci->proc = p; ci->proc = p;
ci->nregs = p->body.irep->nregs; ci->nregs = p->body.irep->nregs;
ci->target_class = MRB_PROC_TARGET_CLASS(p); ci->target_class = MRB_PROC_TARGET_CLASS(p);
c->stack += nregs;
env = MRB_PROC_ENV(p); env = MRB_PROC_ENV(p);
mrb_assert(env); mrb_assert(env);
exc = mrb->exc; mrb->exc = 0; exc = mrb->exc; mrb->exc = 0;
......
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