From d3e273ba4e6a7bc3d297c6f4b49aca0ebc4495c5 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Thu, 30 Nov 2017 08:04:27 +0900
Subject: Wrong stack adjustment in `ecall()` (f35f975 #3859); fix #3862

---
 src/vm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vm.c b/src/vm.c
index 502f85733..6ab37ded6 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -316,6 +316,7 @@ ecall(mrb_state *mrb)
   ptrdiff_t cioff;
   int ai = mrb_gc_arena_save(mrb);
   int i = --c->eidx;
+  int nregs;
 
   if (i<0) return;
   if (ci - c->cibase > MRB_FUNCALL_DEPTH_MAX) {
@@ -325,7 +326,7 @@ ecall(mrb_state *mrb)
   if (!p) return;
   mrb_assert(!MRB_PROC_CFUNC_P(p));
   c->ensure[i] = NULL;
-  c->stack += ci->proc->body.irep->nregs;
+  nregs = ci->proc->body.irep->nregs;
   cioff = ci - c->cibase;
   ci = cipush(mrb);
   ci->stackent = mrb->c->stack;
@@ -335,6 +336,7 @@ ecall(mrb_state *mrb)
   ci->proc = p;
   ci->nregs = p->body.irep->nregs;
   ci->target_class = MRB_PROC_TARGET_CLASS(p);
+  c->stack += nregs;
   env = MRB_PROC_ENV(p);
   mrb_assert(env);
   exc = mrb->exc; mrb->exc = 0;
-- 
cgit v1.2.3