summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-02 08:32:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-02 08:32:48 +0000
commit5e79c1a543135d474addc9898e3246fe36ff37fd (patch)
treeac3e549442577ecafaa965061cc8cbb5631d1554
parentb996367eb50402cfb343e671a2ea2cf1450a8ec4 (diff)
marshal.c: no overwriting ivars
* marshal.c (copy_ivar_i): get rid of overwriting already copied instance variales. c.f. [Bug #8276] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--marshal.c6
-rw-r--r--test/ruby/test_marshal.rb26
3 files changed, 29 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7642797a3a..f4208d61fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/marshal.c b/marshal.c
index dc0194c8dc..abe3375b34 100644
--- a/marshal.c
+++ b/marshal.c
@@ -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