diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ext/objspace/objspace.c | 2 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,12 @@ +Mon Dec 16 19:12:54 2013 Koichi Sasada <ko1@atdot.net> + + * ext/objspace/objspace.c (reachable_object_from_root_i): use + compare_by_identity hash to avoid hash modify problem + during iteration. + [Bug #9252] + + * ext/objspace/objspace.c (reachable_objects_from_root): ditto. + Mon Dec 16 18:16:28 2013 Koichi Sasada <ko1@atdot.net> * gc.c (gc_verify_internal_consistency): should not use diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index bddc1ceed1..b1f1358c01 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -673,6 +673,7 @@ reachable_object_from_root_i(const char *category, VALUE obj, void *ptr) data->last_category = category; category_str = data->last_category_str = rb_str_new2(category); category_objects = data->last_category_objects = rb_hash_new(); + rb_funcall(category_objects, rb_intern("compare_by_identity"), 0); if (!NIL_P(rb_hash_lookup(data->categories, category_str))) { rb_bug("reachable_object_from_root_i: category should insert at once"); } @@ -711,6 +712,7 @@ reachable_objects_from_root(VALUE self) VALUE hash = data.categories = rb_hash_new(); data.last_category = 0; + rb_funcall(hash, rb_intern("compare_by_identity"), 0); rb_objspace_reachable_objects_from_root(reachable_object_from_root_i, &data); rb_hash_foreach(hash, collect_values_of_values, hash); |