admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-11-30 08:04:27 +09:00
parent f3279b41e6
commit d3e273ba4e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+3 -1
View File
@@ -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;