summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-11-29 12:14:05 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-11-29 12:14:05 +0900
commitf35f975d26fea23c00a2908f8686fa1b0476096a (patch)
tree8c407678295bb9557b6ce877618c38a922f5080f /src/vm.c
parentd4fc98052730c7f1716166fb87f9aab00cbfec1d (diff)
downloadmruby-f35f975d26fea23c00a2908f8686fa1b0476096a.tar.gz
mruby-f35f975d26fea23c00a2908f8686fa1b0476096a.zip
Fixed stack address adjustment in `ecall()`; fix #3859
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c2
1 files changed, 1 insertions, 1 deletions
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));