diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index f13ef4d..237456f 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -3069,7 +3069,7 @@ gzfile_read_all(struct gzfile *gz, VALUE dst) rb_str_resize(dst, 0); return dst; } - return rb_str_new(0, 0); + return rb_enc_str_new(0, 0, gz->enc); } dst = zstream_detach_buffer(&gz->z); diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index e1ecbf8..4fa44a7 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -1387,6 +1387,20 @@ def test_encoding } end + def test_read_encoding_at_eof + gz = Zlib.gzip("foo") + Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "EUC-JP") do |f| + enc = f.read.encoding + s = f.read + assert_equal("", s) + assert_equal(enc, s.encoding) + end + Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "Shift_JIS", internal_encoding: "UTF-8") do |f| + f.read + assert_equal(Encoding::UTF_8, f.read.encoding) + end + end + def test_double_close Tempfile.create("test_zlib_gzip_reader_close") {|t| t.binmode