Skip to content

Detect a separator modified during Zlib::GzipReader#gets #162

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

Open
mame wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Detect a separator modified during Zlib::GzipReader#gets #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4338,7 +4338,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
static void
rscheck(const char *rsptr, rb_len_t rslen, VALUE rs)
{
if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
if (RSTRING_PTR(rs) != rsptr || RSTRING_LEN(rs) != rslen)
rb_raise(rb_eRuntimeError, "rs modified");
}

Expand Down
13 changes: 13 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 @@ -987,6 +987,19 @@ def test_read0
assert_equal("", Zlib::GzipReader.new(StringIO.new(D0)).read(0))
end

def test_gets_separator_modified_by_io
rs = "-" * 1000
src = StringIO.new(Zlib.gzip(Random.new(0).bytes(200_000).tr("-", "x") + rs))
n = 0
io = Object.new
io.define_singleton_method(:readpartial) do |len, buf = nil|
(rs.clear << "-" * 1000) if (n += 1) == 300
src.readpartial([len, 100].min, *buf)
end
gz = Zlib::GzipReader.new(io)
assert_raise_with_message(RuntimeError, "rs modified") { gz.gets(rs) }
end

def test_ungetc
s = "".dup
w = Zlib::GzipWriter.new(StringIO.new(s))
Expand Down
Loading