1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObjectSpace.dump: handle Module#set_temporary_name

Browse Source 
[Bug #20892]

Until the introduction of that method, it was impossible for a
Module name not to be valid JSON, hence it wasn't going through
the slower escaping function.

This assumption no longer hold.
This commit is contained in:
Jean Boussier 2024-11-12 19:52:39 +01:00
parent 6c123649cd
commit ee1cd1656f
Notes: git 2024-11-12 19:21:44 +00:00 
Merged: https://github.com/ruby/ruby/pull/12067
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/objspace/objspace_dump.c
View File

@ -549,9 +549,8 @@ dump_object(VALUE obj, struct dump_config *dc)
if (dc->cur_obj_klass) { if (dc->cur_obj_klass) {
VALUE mod_name = rb_mod_name(obj); VALUE mod_name = rb_mod_name(obj);
if (!NIL_P(mod_name)) { if (!NIL_P(mod_name)) {
dump_append(dc, ", \"name\":\""); dump_append(dc, ", \"name\":");
dump_append(dc, RSTRING_PTR(mod_name)); dump_append_string_value(dc, mod_name);
dump_append(dc, "\"");
} }
else { else {
VALUE real_mod_name = rb_mod_name(rb_class_real(obj)); VALUE real_mod_name = rb_mod_name(rb_class_real(obj));

6
test/objspace/test_objspace.rb
View File

@ -902,6 +902,12 @@ class TestObjSpace < Test::Unit::TestCase
# load_allocation_path_helper 'iseq = RubyVM::InstructionSequence.load_from_binary(File.binread(path))', to_binary: true # load_allocation_path_helper 'iseq = RubyVM::InstructionSequence.load_from_binary(File.binread(path))', to_binary: true
end end
def test_escape_class_name
class_name = '" little boby table [Bug #20892]'
json = ObjectSpace.dump(Class.new.tap { |c| c.set_temporary_name(class_name) })
assert_equal class_name, JSON.parse(json)["name"]
end
def test_utf8_method_names def test_utf8_method_names
name = "utf8_❨╯°□°❩╯︵┻━┻" name = "utf8_❨╯°□°❩╯︵┻━┻"
obj = ObjectSpace.trace_object_allocations do obj = ObjectSpace.trace_object_allocations do