diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-02 08:32:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-02 08:32:48 +0000 |
commit | 5e79c1a543135d474addc9898e3246fe36ff37fd (patch) | |
tree | ac3e549442577ecafaa965061cc8cbb5631d1554 /marshal.c | |
parent | b996367eb50402cfb343e671a2ea2cf1450a8ec4 (diff) | |
download | ruby-5e79c1a543135d474addc9898e3246fe36ff37fd.tar.gz |
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
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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; } |