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

Clear stack in OP_CALL; fix #3694

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-06-14 02:26:00 +09:00
parent 7830b841c7
commit b979226871
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+7 -5
View File
@@ -856,9 +856,7 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac
if (stack_keep > nregs)
nregs = stack_keep;
stack_extend(mrb, nregs);
if (nregs > stack_keep) {
stack_clear(c->stack + stack_keep, nregs - stack_keep);
}
stack_clear(c->stack + stack_keep, nregs - stack_keep);
c->stack[0] = self;
result = mrb_vm_exec(mrb, proc, irep->iseq);
if (c->ci - c->cibase > cioff) {
@@ -1437,10 +1435,14 @@ RETRY_TRY_BLOCK:
syms = irep->syms;
ci->nregs = irep->nregs;
if (ci->argc < 0) {
stack_extend(mrb, (irep->nregs < 3) ? 3 : irep->nregs);
if (irep->nregs > 3) {
stack_extend(mrb, irep->nregs);
stack_clear(regs+3, irep->nregs-3);
}
}
else {
else if (ci->argc+2 < irep->nregs) {
stack_extend(mrb, irep->nregs);
stack_clear(regs+ci->argc+2, irep->nregs-ci->argc-2);
}
if (m->env) {
regs[0] = m->env->stack[0];