Permalink
Browse files

Protect ensure clause lambdas from GC; fix #3491

  • Loading branch information...
matz committed Apr 3, 2017
1 parent 6a992a2 commit b8461c86817fd2f766746e61e9f93362955a3474
Showing with 5 additions and 6 deletions.
  1. +3 −5 src/gc.c
  2. +2 −1 src/vm.c
View
@@ -565,7 +565,7 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
static void
mark_context(mrb_state *mrb, struct mrb_context *c)
{
int i, e = 0;
int i;
mrb_callinfo *ci;
/* mark stack */
@@ -574,16 +574,14 @@ mark_context(mrb_state *mrb, struct mrb_context *c)
/* mark VM stack */
if (c->cibase) {
for (ci = c->cibase; ci <= c->ci; ci++) {
if (ci->eidx > e) {
e = ci->eidx;
}
mrb_gc_mark(mrb, (struct RBasic*)ci->env);
mrb_gc_mark(mrb, (struct RBasic*)ci->proc);
mrb_gc_mark(mrb, (struct RBasic*)ci->target_class);
}
}
/* mark ensure stack */
for (i=0; i<e; i++) {
for (i=0; i<c->esize; i++) {
if (c->ensure[i] == NULL) break;
mrb_gc_mark(mrb, (struct RBasic*)c->ensure[i]);
}
/* mark fibers */
View
@@ -296,6 +296,7 @@ ecall(mrb_state *mrb, int i)
}
p = mrb->c->ensure[i];
if (!p) return;
mrb->c->ensure[i] = NULL;
if (mrb->c->ci->eidx > i)
mrb->c->ci->eidx = i;
cioff = mrb->c->ci - mrb->c->cibase;
@@ -310,7 +311,6 @@ ecall(mrb_state *mrb, int i)
mrb->c->stack = mrb->c->stack + ci[-1].nregs;
exc = mrb->exc; mrb->exc = 0;
mrb_run(mrb, p, *self);
mrb->c->ensure[i] = NULL;
mrb->c->ci = mrb->c->cibase + cioff;
if (!mrb->exc) mrb->exc = exc;
}
@@ -1148,6 +1148,7 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
mrb->c->ensure = (struct RProc **)mrb_realloc(mrb, mrb->c->ensure, sizeof(struct RProc*) * mrb->c->esize);
}
mrb->c->ensure[mrb->c->ci->eidx++] = p;
mrb->c->ensure[mrb->c->ci->eidx] = NULL;
ARENA_RESTORE(mrb, ai);
NEXT;
}

0 comments on commit b8461c8

Please sign in to comment.