From f35f975d26fea23c00a2908f8686fa1b0476096a Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Wed, 29 Nov 2017 12:14:05 +0900
Subject: Fixed stack address adjustment in `ecall()`; fix #3859

---
 src/vm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/vm.c')

diff --git a/src/vm.c b/src/vm.c
index 57df9d042..0798250fa 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -325,6 +325,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;
   cioff = ci - c->cibase;
   ci = cipush(mrb);
   ci->stackent = mrb->c->stack;
@@ -336,7 +337,6 @@ ecall(mrb_state *mrb)
   ci->target_class = MRB_PROC_TARGET_CLASS(p);
   env = MRB_PROC_ENV(p);
   mrb_assert(env);
-  c->stack += p->upper->body.irep->nregs;
   exc = mrb->exc; mrb->exc = 0;
   if (exc) {
     mrb_gc_protect(mrb, mrb_obj_value(exc));
-- 
cgit v1.2.3