Skip to content

Fix Zlib.gunzip with a header truncated in the file name or comment #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsbt merged 2 commits into from
Oct 25, 2026
Merged

Fix Zlib.gunzip with a header truncated in the file name or comment #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a16601d
Fix Zlib.gunzip with a header truncated in the file name or comment
hsbt Oct 24, 2026
2fc5eb7
Test Zlib.gunzip with optional gzip header fields
hsbt Oct 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,6 +2679,9 @@ gzfile_read_raw_until_zero(struct gzfile *gz, rb_len_t offset)
p = memchr(RSTRING_PTR(gz->z.input) + offset, '\0',
RSTRING_LEN(gz->z.input) - offset);
if (p) break;
if (gz->io == Qundef) {
rb_raise(cGzError, "unexpected end of string");
}
str = gzfile_read_raw(gz, Qnil);
if (NIL_P(str)) {
rb_raise(cGzError, "unexpected end of file");
Expand Down
38 changes: 38 additions & 0 deletions test/zlib/test_zlib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,44 @@ def test_gunzip

src = %w[1f8b080000000000000].pack("H*")
assert_raise(Zlib::GzipFile::Error){ Zlib.gunzip(src) }

src = %w[1f8b08080000000000036e616d65].pack("H*")
assert_raise(Zlib::GzipFile::Error){ Zlib.gunzip(src) }

src = %w[1f8b08100000000000036e616d65].pack("H*")
assert_raise(Zlib::GzipFile::Error){ Zlib.gunzip(src) }
end

def test_gunzip_orig_name_and_comment
[["X", nil], [nil, "Y"], ["X", "Y"], ["", ""]].each do |orig_name, comment|
gz = Zlib::GzipWriter.new(StringIO.new(s = "".dup))
gz.orig_name = orig_name if orig_name
gz.comment = comment if comment
gz.print("foo")
gz.finish
assert_equal("foo", Zlib.gunzip(s), [orig_name, comment].inspect)
end
end

def test_gunzip_corrupted_header
gz = Zlib::GzipWriter.new(StringIO.new(s = "".dup))
gz.orig_name = "X"
gz.comment = "Y"
gz.print("foo")
gz.finish
# see TestZlibGzipReader#test_corrupted_header
1.upto(14) do |idx|
assert_raise(Zlib::GzipFile::Error, idx.to_s) do
Zlib.gunzip(s[0, idx])
end
end

# FEXTRA cut in its length and in its data
%w[1f8b080400000000000304 1f8b0804000000000003040061].each do |hex|
assert_raise(Zlib::GzipFile::Error, hex) do
Zlib.gunzip([hex].pack("H*"))
end
end
end

# Zlib.gunzip input is always considered a binary string, regardless of its String#encoding.
Expand Down
Loading