diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 00:50:33 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 00:50:33 +0000 |
| commit | 9e11c028e3ff12da9e44f1ece7d100b84834e183 (patch) | |
| tree | e4cb1f38eaef871e9132a97a9dc5ef96f71afe55 /ext | |
| parent | 941bd1c392d9213193804ef9be503c5d039dda04 (diff) | |
merge revision(s) 45076: [Backport #9535]
* class.c (rb_mod_init_copy): do nothing if copying self.
[ruby-dev:47989] [Bug #9535]
* hash.c (rb_hash_initialize_copy): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/generator/generator.c | 1 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index 0db7f2a73a..c5bbec08a4 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -1033,6 +1033,7 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig) { JSON_Generator_State *objState, *origState; + if (obj == orig) return obj; Data_Get_Struct(obj, JSON_Generator_State, objState); Data_Get_Struct(orig, JSON_Generator_State, origState); if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State"); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 750074101e..b916910e3e 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1334,6 +1334,7 @@ rb_deflate_init_copy(VALUE self, VALUE orig) Data_Get_Struct(self, struct zstream, z1); z2 = get_zstream(orig); + if (z1 == z2) return self; err = deflateCopy(&z1->stream, &z2->stream); if (err != Z_OK) { raise_zlib_error(err, 0); |