diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 6 | ||||
-rw-r--r-- | test/ruby/test_marshal.rb | 26 |
3 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu May 2 17:32:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (copy_ivar_i): get rid of overwriting already copied + instance variales. c.f. [Bug #8276] + Thu May 2 16:55:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (id_locals): use cached ID. @@ -1373,7 +1373,11 @@ r_leave(VALUE v, struct load_arg *arg) static int copy_ivar_i(st_data_t key, st_data_t val, st_data_t arg) { - rb_ivar_set((VALUE)arg, (ID)key, (VALUE)val); + VALUE obj = (VALUE)arg, value = (VALUE)val; + ID vid = (ID)key; + + if (!rb_ivar_defined(obj, vid)) + rb_ivar_set(obj, vid, value); return ST_CONTINUE; } diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index d7afec3f66..b0f066a5a3 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -555,6 +555,16 @@ class TestMarshal < Test::Unit::TestCase alias marshal_load initialize end + class FrozenData < LoadData + def marshal_load(data) + super + data.instance_variables.each do |iv| + instance_variable_set(iv, data.instance_variable_get(iv)) + end + freeze + end + end + def test_marshal_dump_excess_encoding bug8276 = '[ruby-core:54334] [Bug #8276]' t = Bug8276.new(bug8276) @@ -574,18 +584,20 @@ class TestMarshal < Test::Unit::TestCase def test_marshal_load_ivar s = "data with ivar" s.instance_variable_set(:@t, 42) - t = LoadData.new(s) - s = Marshal.dump(t) hook = ->(v) { if LoadData === v - assert_send([v, :instance_variable_defined?, :@t]) - assert_equal(42, v.instance_variable_get(:@t)) + assert_send([v, :instance_variable_defined?, :@t], v.class.name) + assert_equal(42, v.instance_variable_get(:@t), v.class.name) end v } - v = Marshal.load(s, hook) - assert_send([v, :instance_variable_defined?, :@t]) - assert_equal(42, v.instance_variable_get(:@t)) + [LoadData, FrozenData].each do |klass| + t = klass.new(s) + d = Marshal.dump(t) + v = assert_nothing_raised(RuntimeError) {break Marshal.load(d, hook)} + assert_send([v, :instance_variable_defined?, :@t], klass.name) + assert_equal(42, v.instance_variable_get(:@t), klass.name) + end end def test_class_ivar |