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

The callinfo stack may be reallocated in cipush; fix rest of #3809

Browse Source 
fix #3809
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-09-11 22:53:26 +09:00
parent 3d8c1a7e97
commit d6e41c3e51
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+13 -14
View File
@@ -1319,30 +1319,29 @@ RETRY_TRY_BLOCK:
CASE(OP_EPOP) {
/* A A.times{ensure_pop().call} */
int a = GETARG_A(i);
mrb_callinfo *ci, *nci;
mrb_callinfo *ci;
mrb_value self = regs[0];
mrb_assert(a==1); /* temporary limitation */
ci = mrb->c->ci;
if (mrb->c->eidx == ci->epos) {
if (mrb->c->eidx == mrb->c->ci->epos) {
NEXT;
}
proc = mrb->c->ensure[--mrb->c->eidx];
nci = cipush(mrb);
nci->mid = ci->mid;
nci->argc = 0;
nci->proc = proc;
nci->stackent = mrb->c->stack;
nci->nregs = irep->nregs;
nci->target_class = proc->target_class;
nci->pc = pc + 1;
nci->acc = nci->nregs;
mrb->c->stack += ci->nregs;
stack_extend(mrb, nci->nregs);
irep = proc->body.irep;
pool = irep->pool;
syms = irep->syms;
ci = cipush(mrb);
ci->mid = ci[-1].mid;
ci->argc = 0;
ci->proc = proc;
ci->stackent = mrb->c->stack;
ci->nregs = irep->nregs;
ci->target_class = proc->target_class;
ci->pc = pc + 1;
ci->acc = ci[-1].nregs;
mrb->c->stack += ci->acc;
stack_extend(mrb, ci->nregs);
regs[0] = self;
pc = irep->iseq;
JUMP;