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

1 files changed, 5 insertions, 1 deletions

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;
 }