1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when

passed object is a special const, instead of SEGV.
  Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug ]

* test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2015-06-20 20:50:20 +00:00
parent a2e4c41829
commit cc77375d2d
3 changed files with 23 additions and 0 deletions

View file

@ -1,3 +1,12 @@
Sun Jun 21 05:31:41 2015 Shota Fukumori <her@sorah.jp>
* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when
passed object is a special const, instead of SEGV.
Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug #11291]
* test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix.
Sat Jun 20 03:56:58 2015 Yusuke Endoh <mame@ruby-lang.org>
* enc/make_encmake.rb: the list of encoding extension libraries must

View file

@ -149,6 +149,11 @@ dump_object(VALUE obj, struct dump_config *dc)
ID flags[RB_OBJ_GC_FLAGS_MAX];
size_t n, i;
if (SPECIAL_CONST_P(obj)) {
dump_append(dc, "{}");
return;
}
dc->cur_obj = obj;
dc->cur_obj_references = 0;
dc->cur_obj_klass = BUILTIN_TYPE(obj) == T_NODE ? 0 : RBASIC_CLASS(obj);

View file

@ -243,6 +243,15 @@ class TestObjSpace < Test::Unit::TestCase
assert_match /"method":"#{loc.base_label}"/, info
end
def test_dump_special_consts
# [ruby-core:69692] [Bug #11291]
assert_equal('{}', ObjectSpace.dump(nil))
assert_equal('{}', ObjectSpace.dump(true))
assert_equal('{}', ObjectSpace.dump(false))
assert_equal('{}', ObjectSpace.dump(0))
assert_equal('{}', ObjectSpace.dump(:foo))
end
def test_dump_all
entry = /"bytesize":11, "value":"TEST STRING", "encoding":"UTF-8", "file":"-", "line":4, "method":"dump_my_heap_please", "generation":/