Skip to content

Reject a negative length in Zlib.crc32_combine #160

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

Reject a negative length in Zlib.crc32_combine #160

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
8 changes: 7 additions & 1 deletion ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,14 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
static VALUE
rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
{
long len = NUM2LONG(len2);

/* zlib 1.3.1 loops forever on a negative length */
if (len < 0) {
rb_raise(rb_eArgError, "negative length");
}
return ULONG2NUM(
crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), NUM2LONG(len2)));
crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), len));
}
#else
#define rb_zlib_crc32_combine rb_f_notimplement
Expand Down
6 changes: 6 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 @@ -1634,6 +1634,12 @@ def test_crc32_combine
end
end

def test_crc32_combine_negative_length
assert_raise(ArgumentError) { Zlib.crc32_combine(0, 0, -1) }
rescue NotImplementedError
omit "crc32_combine is not implemented"
end

def test_crc_table
t = Zlib.crc_table
assert_instance_of(Array, t)
Expand Down
Loading