Clear unused stack region that may refer freed objects; fix #3596

This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-10 09:46:09 +09:00
parent 491d68bb30
commit 5c114c91d4
+5 -4
View File
@@ -544,6 +544,7 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
{ {
size_t i; size_t i;
size_t e; size_t e;
mrb_value nil;
if (c->stack == NULL) return; if (c->stack == NULL) return;
e = c->stack - c->stbase; e = c->stack - c->stbase;
@@ -553,13 +554,13 @@ mark_context_stack(mrb_state *mrb, struct mrb_context *c)
mrb_value v = c->stbase[i]; mrb_value v = c->stbase[i];
if (!mrb_immediate_p(v)) { if (!mrb_immediate_p(v)) {
if (mrb_basic_ptr(v)->tt == MRB_TT_FREE) {
c->stbase[i] = mrb_nil_value();
}
else {
mrb_gc_mark(mrb, mrb_basic_ptr(v)); mrb_gc_mark(mrb, mrb_basic_ptr(v));
} }
} }
e = c->stend - c->stbase;
nil = mrb_nil_value();
for (; i<e; i++) {
c->stbase[i] = nil;
} }
} }