Skip to content

Do not raise Zlib::BufError when the dictionary id ends the available input #173

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
segiddins wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not raise Zlib::BufError when the dictionary id ends the available input #173

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
7 changes: 5 additions & 2 deletions ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,11 +1212,14 @@ zstream_run_try(VALUE value_arg)
VALUE dict = rb_hash_aref(dicts, rb_uint2inum(z->stream.adler));
if (!NIL_P(dict)) {
rb_inflate_set_dictionary(self, dict);
goto loop;
if (z->stream.avail_in > 0) goto loop;
/* the dictionary id was the last byte available; inflate()
* would only report Z_BUF_ERROR now */
err = Z_OK;
}
}
}
raise_zlib_error(err, z->stream.msg);
if (err != Z_OK) raise_zlib_error(err, z->stream.msg);
}

if (z->stream.avail_in > 0) {
Expand Down
16 changes: 16 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 @@ -283,6 +283,22 @@ def test_add_dictionary
assert_equal "foofoofoo", out
end

def test_add_dictionary_byte_at_a_time
dict = "hello world"
d = Zlib::Deflate.new
d.set_dictionary(dict)
deflated = d.deflate("hello", Zlib::FINISH)
d.close
z = Zlib::Inflate.new
z.add_dictionary(dict)
out = "".dup
# feeding the byte that completes the dictionary id used to raise BufError
deflated.each_byte { |b| out << z.inflate(b.chr) }
out << z.finish
assert_equal("hello", out)
z.close
end

def test_finish_chunked
# zeros = Zlib::Deflate.deflate("0" * 100_000)
zeros = "x\234\355\3011\001\000\000\000\302\240J\353\237\316\032\036@" \
Expand Down
Loading