Permalink
Browse files

Protect arguments from GC; fix #3597

GC may be called with OP_ENTER (especially when GC_STRESS is set).
  • Loading branch information...
matz committed Apr 10, 2017
1 parent a55b237 commit 0048dd118a0d57ff87265593819f9e93e05fafed
Showing with 8 additions and 2 deletions.
  1. +7 −1 src/gc.c
  2. +1 −1 src/vm.c
View
@@ -545,10 +545,16 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
size_t i;
size_t e;
mrb_value nil;
int nregs;
if (c->stack == NULL) return;
e = c->stack - c->stbase;
if (c->ci) e += c->ci->nregs;
if (c->ci) {
nregs = c->ci->argc + 2;
if (c->ci->nregs > nregs)
nregs = c->ci->nregs;
e += nregs;
}
if (c->stbase + e > c->stend) e = c->stend - c->stbase;
for (i=0; i<e; i++) {
mrb_value v = c->stbase[i];
View
@@ -1589,7 +1589,6 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
argc = mrb_ary_ptr(argv[0])->len;
argv = mrb_ary_ptr(argv[0])->ptr;
}
mrb->c->ci->argc = len;
if (argc < len) {
int mlen = m2;
if (argc < m1+m2) {
@@ -1639,6 +1638,7 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
}
pc += o + 1;
}
mrb->c->ci->argc = len;
/* clear local (but non-argument) variables */
if (irep->nlocals-len-2 > 0) {
stack_clear(&regs[len+2], irep->nlocals-len-2);

0 comments on commit 0048dd1

Please sign in to comment.