From 99257f88180cf0f2c20f36df91797578845db5dd Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 25 Oct 2026 09:25:44 +0900 Subject: [PATCH 1/2] Keep the encoding of GzipReader#read at EOF Without a length, GzipReader#read returned a binary empty string once all data had been read, while the earlier calls return strings in the read encoding. IO#read keeps the read encoding at EOF too. Co-Authored-By: Claude Opus 5.5 --- ext/zlib/zlib.c | 2 +- test/zlib/test_zlib.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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..f5ff9f3 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| + f.read + s = f.read + assert_equal("", s) + assert_equal(Encoding::EUC_JP, 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 From c096402b41b35efacc0c529076687d1281cbf507 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 10 Nov 2026 18:34:25 +0900 Subject: [PATCH 2/2] Compare with the encoding before EOF in test_read_encoding_at_eof With Encoding.default_internal set, as under ruby -U, GzipReader converts to it and the read encoding is not EUC-JP. Co-Authored-By: Claude Opus 5.5 --- test/zlib/test_zlib.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb index f5ff9f3..4fa44a7 100644 --- a/test/zlib/test_zlib.rb +++ b/test/zlib/test_zlib.rb @@ -1390,10 +1390,10 @@ def test_encoding def test_read_encoding_at_eof gz = Zlib.gzip("foo") Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "EUC-JP") do |f| - f.read + enc = f.read.encoding s = f.read assert_equal("", s) - assert_equal(Encoding::EUC_JP, s.encoding) + assert_equal(enc, s.encoding) end Zlib::GzipReader.wrap(StringIO.new(gz), external_encoding: "Shift_JIS", internal_encoding: "UTF-8") do |f| f.read