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

marshal.c: check instance variable count

Browse source 
* marshal.c (w_ivar_each): ensure that no instance variable was
  removed while dumping other instance variables.  [Bug #15968]
This commit is contained in:
Nobuyoshi Nakada 2019-07-01 16:20:03 +09:00
parent 0b1e26398e
commit 78ee2c2453
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
marshal.c
View file

@ -258,7 +258,7 @@ class2path(VALUE klass)
int ruby_marshal_write_long(long x, char *buf); int ruby_marshal_write_long(long x, char *buf);
static void w_long(long, struct dump_arg*); static void w_long(long, struct dump_arg*);
static void w_encoding(VALUE encname, struct dump_call_arg *arg); static int w_encoding(VALUE encname, struct dump_call_arg *arg);
static VALUE encoding_name(VALUE obj, struct dump_arg *arg); static VALUE encoding_name(VALUE obj, struct dump_arg *arg);
static void static void
@ -626,7 +626,7 @@ encoding_name(VALUE obj, struct dump_arg *arg)
} }
} }
static void static int
w_encoding(VALUE encname, struct dump_call_arg *arg) w_encoding(VALUE encname, struct dump_call_arg *arg)
{ {
int limit = arg->limit; int limit = arg->limit;
@ -636,11 +636,13 @@ w_encoding(VALUE encname, struct dump_call_arg *arg)
case Qtrue: case Qtrue:
w_symbol(ID2SYM(rb_intern("E")), arg->arg); w_symbol(ID2SYM(rb_intern("E")), arg->arg);
w_object(encname, arg->arg, limit); w_object(encname, arg->arg, limit);
return 1;
case Qnil: case Qnil:
return; return 0;
} }
w_symbol(ID2SYM(rb_id_encoding()), arg->arg); w_symbol(ID2SYM(rb_id_encoding()), arg->arg);
w_object(encname, arg->arg, limit); w_object(encname, arg->arg, limit);
return 1;
} }
static st_index_t static st_index_t
@ -670,13 +672,17 @@ w_ivar_each(VALUE obj, st_index_t num, struct dump_call_arg *arg)
struct w_ivar_arg ivarg = {arg, num}; struct w_ivar_arg ivarg = {arg, num};
if (!num) return; if (!num) return;
rb_ivar_foreach(obj, w_obj_each, (st_data_t)&ivarg); rb_ivar_foreach(obj, w_obj_each, (st_data_t)&ivarg);
if (ivarg.num_ivar) {
rb_raise(rb_eRuntimeError, "instance variable removed from %"PRIsVALUE" instance",
CLASS_OF(arg->obj));
}
} }
static void static void
w_ivar(st_index_t num, VALUE ivobj, VALUE encname, struct dump_call_arg *arg) w_ivar(st_index_t num, VALUE ivobj, VALUE encname, struct dump_call_arg *arg)
{ {
w_long(num, arg->arg); w_long(num, arg->arg);
w_encoding(encname, arg); num -= w_encoding(encname, arg);
if (ivobj != Qundef) { if (ivobj != Qundef) {
w_ivar_each(ivobj, num, arg); w_ivar_each(ivobj, num, arg);
} }

12
test/ruby/test_marshal.rb
View file

@ -795,7 +795,11 @@ class TestMarshal < Test::Unit::TestCase
end end
def marshal_dump def marshal_dump
if self.foo.baz
self.foo.remove_instance_variable(:@baz)
else
self.foo.baz = :problem self.foo.baz = :problem
end
{foo: self.foo} {foo: self.foo}
end end
@ -811,4 +815,12 @@ class TestMarshal < Test::Unit::TestCase
Marshal.dump(obj) Marshal.dump(obj)
end end
end end
def test_marshal_dump_removing_instance_variable
obj = Bug15968.new
obj.baz = :Bug15968
assert_raise_with_message(RuntimeError, /instance variable removed/) do
Marshal.dump(obj)
end
end
end end