From 4bfd25d4050c91cbc4f91c884ee65055d943668c Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sun, 27 Apr 2014 02:48:11 +0900 Subject: mark may be missed when eval() is called --- src/gc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/gc.c b/src/gc.c index a71bb7d37..264159a93 100644 --- a/src/gc.c +++ b/src/gc.c @@ -448,26 +448,28 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c) static void mark_context(mrb_state *mrb, struct mrb_context *c) { - size_t i; - size_t e; + int i, e = 0; mrb_callinfo *ci; /* mark stack */ mark_context_stack(mrb, c); - /* mark ensure stack */ - e = (c->ci) ? c->ci->eidx : 0; - for (i=0; iensure[i]); - } /* mark VM stack */ if (c->cibase) { for (ci = c->cibase; ci <= c->ci; ci++) { + if (ci->eidx > e) { + abort(); + 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; iensure[i]); + } /* mark fibers */ if (c->prev && c->prev->fib) { mrb_gc_mark(mrb, (struct RBasic*)c->prev->fib); -- cgit v1.2.3