Stack may be reallocated in mrb_run(); fix #3465

This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-02-27 16:17:57 +09:00
parent 736be0e98b
commit 9e93d5dbf0
+3 -3
View File
@@ -289,7 +289,7 @@ ecall(mrb_state *mrb, int i)
mrb_value *self = mrb->c->stack;
struct RObject *exc;
int cioff;
mrb_value *nstk;
ptrdiff_t nstk;
if (i<0) return;
p = mrb->c->ensure[i];
@@ -298,7 +298,7 @@ ecall(mrb_state *mrb, int i)
mrb->c->ci->eidx = i;
cioff = mrb->c->ci - mrb->c->cibase;
ci = cipush(mrb);
nstk = ci->stackent;
nstk = ci->stackent - mrb->c->stbase;
ci->stackent = mrb->c->stack;
ci->mid = ci[-1].mid;
ci->acc = CI_ACC_SKIP;
@@ -310,7 +310,7 @@ ecall(mrb_state *mrb, int i)
exc = mrb->exc; mrb->exc = 0;
mrb_run(mrb, p, *self);
mrb->c->ensure[i] = NULL;
ci->stackent = nstk;
ci->stackent = mrb->c->stbase + nstk;
mrb->c->ci = mrb->c->cibase + cioff;
if (!mrb->exc) mrb->exc = exc;
}