diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:41:03 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-28 13:41:03 +0000 |
| commit | 73dae42f511b359a1c649b253a3558cc129db91e (patch) | |
| tree | 953b079ce51ba850c0f9127a47aac3d0c2cb0859 /ext | |
| parent | bb40ff921676511a54c171a83dc3f3afe8b617f3 (diff) | |
merges r30772,r30773 and r30776 from trunk into ruby_1_9_2.
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_new_shared
because gz->z.input is hidden string. [ruby-core:35057]
--
e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
--
* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
before rb_str_resurrect.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index c52ebf3020..c454d26e04 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2400,7 +2400,7 @@ gzfile_reader_get_unused(struct gzfile *gz) } if (NIL_P(gz->z.input)) return Qnil; - str = rb_str_dup(gz->z.input); + str = rb_str_resurrect(gz->z.input); OBJ_TAINT(str); /* for safe */ return str; } |