diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 3 | ||||
| -rw-r--r-- | test/zlib/test_zlib.rb | 32 |
3 files changed, 33 insertions, 4 deletions
@@ -1,6 +1,6 @@ Thu Feb 3 18:33:26 2011 NARUSE, Yui <naruse@ruby-lang.org> - * ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_new_shared + e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect because gz->z.input is hidden string. [ruby-core:35057] Thu Feb 3 16:34:10 2011 NARUSE, Yui <naruse@ruby-lang.org> diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 43448818d3..5289f83583 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -2471,7 +2471,8 @@ gzfile_reader_get_unused(struct gzfile *gz) } if (NIL_P(gz->z.input)) return Qnil; - str = rb_str_new_shared(gz->z.input); + str = rb_str_dup(gz->z.input); + str = rb_str_resurrect(str); OBJ_TAINT(str); /* for safe */ return str; } diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index 68b44a1c32..82352238ca 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -491,13 +491,41 @@ if defined? Zlib Zlib::GzipWriter.open(t.path) {|gz| gz.print("foobar") } Zlib::GzipReader.open(t.path) do |f| + assert_equal(nil, f.unused) assert_equal("foo", f.read(3)) - f.unused + assert_equal(nil, f.unused) assert_equal("bar", f.read) - f.unused + assert_equal(nil, f.unused) end end + def test_unused2 + zio = StringIO.new + + io = Zlib::GzipWriter.new zio + io.write 'aaaa' + io.finish + + io = Zlib::GzipWriter.new zio + io.write 'bbbb' + io.finish + + zio.rewind + + io = Zlib::GzipReader.new zio + assert_equal('aaaa', io.read) + unused = io.unused + assert_equal(24, unused.bytesize) + io.finish + + zio.pos -= unused.length + + io = Zlib::GzipReader.new zio + assert_equal('bbbb', io.read) + assert_equal(nil, io.unused) + io.finish + end + def test_read t = Tempfile.new("test_zlib_gzip_reader_read") t.close |