From 2599c1932e1217ba51d084b3530ab851707929bf Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 31 May 2017 00:18:32 +0900 Subject: Clear VM stack for top level; fix #3676 Top-level local variables contained junk after ab25eaea2 --- src/vm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/vm.c b/src/vm.c index f300b47b4..493234053 100644 --- a/src/vm.c +++ b/src/vm.c @@ -851,13 +851,19 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac mrb_value result; struct mrb_context *c = mrb->c; int cioff = c->ci - c->cibase; + int nregs = irep->nregs; + mrb_value *stk; if (!c->stack) { stack_init(mrb); } - if (stack_keep < irep->nregs) - stack_keep = irep->nregs; - stack_extend(mrb, stack_keep); + if (stack_keep > nregs) + nregs = stack_keep; + stk = c->stack + stack_keep; + if (stk < c->stend) { + stack_clear(stk, c->stend - stk); + } + stack_extend(mrb, nregs); c->stack[0] = self; result = mrb_vm_exec(mrb, proc, irep->iseq); if (c->ci - c->cibase > cioff) { -- cgit v1.2.3