From c8da60275281dc54310aa0d7e45085c55ee8bda3 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 17 Nov 2017 01:08:46 +0900 Subject: Need to save stack space by number of registers from the current proc, Not from the execution ensure proc; fix #3849 --- src/vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vm.c b/src/vm.c index dd68e8a79..6bf6877a4 100644 --- a/src/vm.c +++ b/src/vm.c @@ -309,6 +309,7 @@ static void ecall(mrb_state *mrb, int i) { struct RProc *p; + int nregs; struct mrb_context *c = mrb->c; mrb_callinfo *ci = c->ci; struct RObject *exc; @@ -323,6 +324,7 @@ ecall(mrb_state *mrb, int i) p = c->ensure[i]; if (!p) return; mrb_assert(!MRB_PROC_CFUNC_P(p)); + nregs = ci->proc->body.irep->nregs; c->ensure[i] = NULL; cioff = ci - c->cibase; ci = cipush(mrb); @@ -335,7 +337,7 @@ ecall(mrb_state *mrb, int i) ci->target_class = MRB_PROC_TARGET_CLASS(p); env = MRB_PROC_ENV(p); mrb_assert(env); - c->stack += p->body.irep->nregs; + c->stack += nregs; exc = mrb->exc; mrb->exc = 0; if (exc) { mrb_gc_protect(mrb, mrb_obj_value(exc)); -- cgit v1.2.3