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

[Bug #19841] Refine error on marshaling recursive USERDEF

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-08-20 13:04:06 +09:00
parent 2782cc75a9
commit 9459bedd84
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2025-03-12 12:44:49 +00:00 
Merged: https://github.com/ruby/ruby/pull/12914
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
marshal.c
View File

@ -156,6 +156,7 @@ struct dump_arg {
st_table *data; st_table *data;
st_table *compat_tbl; st_table *compat_tbl;
st_table *encodings; st_table *encodings;
st_table *userdefs;
st_index_t num_entries; st_index_t num_entries;
}; };
@ -204,6 +205,7 @@ mark_dump_arg(void *ptr)
rb_mark_set(p->symbols); rb_mark_set(p->symbols);
rb_mark_set(p->data); rb_mark_set(p->data);
rb_mark_hash(p->compat_tbl); rb_mark_hash(p->compat_tbl);
rb_mark_set(p->userdefs);
rb_gc_mark(p->str); rb_gc_mark(p->str);
} }
@ -221,6 +223,7 @@ memsize_dump_arg(const void *ptr)
if (p->symbols) memsize += rb_st_memsize(p->symbols); if (p->symbols) memsize += rb_st_memsize(p->symbols);
if (p->data) memsize += rb_st_memsize(p->data); if (p->data) memsize += rb_st_memsize(p->data);
if (p->compat_tbl) memsize += rb_st_memsize(p->compat_tbl); if (p->compat_tbl) memsize += rb_st_memsize(p->compat_tbl);
if (p->userdefs) memsize += rb_st_memsize(p->userdefs);
if (p->encodings) memsize += rb_st_memsize(p->encodings); if (p->encodings) memsize += rb_st_memsize(p->encodings);
return memsize; return memsize;
} }
@ -887,6 +890,9 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
st_index_t hasiv2; st_index_t hasiv2;
VALUE encname2; VALUE encname2;
if (arg->userdefs && st_is_member(arg->userdefs, (st_data_t)obj)) {
rb_raise(rb_eRuntimeError, "can't dump recursive object using _dump()");
}
v = INT2NUM(limit); v = INT2NUM(limit);
v = dump_funcall(arg, obj, s_dump, 1, &v); v = dump_funcall(arg, obj, s_dump, 1, &v);
if (!RB_TYPE_P(v, T_STRING)) { if (!RB_TYPE_P(v, T_STRING)) {
@ -903,7 +909,13 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
w_class(TYPE_USERDEF, obj, arg, FALSE); w_class(TYPE_USERDEF, obj, arg, FALSE);
w_bytes(RSTRING_PTR(v), RSTRING_LEN(v), arg); w_bytes(RSTRING_PTR(v), RSTRING_LEN(v), arg);
if (hasiv) { if (hasiv) {
st_data_t userdefs = (st_data_t)obj;
if (!arg->userdefs) {
arg->userdefs = rb_init_identtable();
}
st_add_direct(arg->userdefs, userdefs, 0);
w_ivar(hasiv, ivobj, encname, &c_arg); w_ivar(hasiv, ivobj, encname, &c_arg);
st_delete(arg->userdefs, &userdefs, NULL);
} }
w_remember(obj, arg); w_remember(obj, arg);
return; return;
@ -1110,6 +1122,10 @@ clear_dump_arg(struct dump_arg *arg)
st_free_table(arg->encodings); st_free_table(arg->encodings);
arg->encodings = 0; arg->encodings = 0;
} }
if (arg->userdefs) {
st_free_table(arg->userdefs);
arg->userdefs = 0;
}
} }
NORETURN(static inline void io_needed(void)); NORETURN(static inline void io_needed(void));
@ -1187,6 +1203,7 @@ rb_marshal_dump_limited(VALUE obj, VALUE port, int limit)
arg->num_entries = 0; arg->num_entries = 0;
arg->compat_tbl = 0; arg->compat_tbl = 0;
arg->encodings = 0; arg->encodings = 0;
arg->userdefs = 0;
arg->str = rb_str_buf_new(0); arg->str = rb_str_buf_new(0);
if (!NIL_P(port)) { if (!NIL_P(port)) {
if (!rb_respond_to(port, s_write)) { if (!rb_respond_to(port, s_write)) {

9
test/ruby/test_marshal.rb
View File

@ -676,6 +676,15 @@ class TestMarshal < Test::Unit::TestCase
end end
end end
def test_recursive_userdef
t = Time.utc(0)
str = "b".b
t.instance_eval {@v = t}
assert_raise_with_message(RuntimeError, /recursive\b.*\b_dump/) do
Marshal.dump(t)
end
end
def test_unloadable_usrmarshal def test_unloadable_usrmarshal
c = eval("class UsrMarshal\u{23F0 23F3}<Time;self;end") c = eval("class UsrMarshal\u{23F0 23F3}<Time;self;end")
c.class_eval { c.class_eval {