Skip to content

Keep the given running value in Zlib.crc32(nil, crc) and Zlib.adler32(nil, adler) #176

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

Keep the given running value in Zlib.crc32(nil, crc) and Zlib.adler32(nil, adler) #176

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
4 changes: 3 additions & 1 deletion ext/zlib/zlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,9 @@ do_checksum(int argc, VALUE *argv, checksum_func func)
}

if (NIL_P(str)) {
sum = func(mask32(sum), Z_NULL, 0);
/* zlib returns the initial value for a NULL buffer, which would discard
* an explicitly given running checksum; behave like an empty string */
sum = NIL_P(vsum) ? func(0, Z_NULL, 0) : func(mask32(sum), (const Bytef *)"", 0);
}
else if (rb_obj_is_kind_of(str, rb_cIO)) {
VALUE buf;
Expand Down
9 changes: 9 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 @@ -1647,6 +1647,15 @@ def test_crc32_combine
end
end

def test_checksum_nil_with_initial_value
assert_equal(Zlib.crc32("", 1234), Zlib.crc32(nil, 1234))
assert_equal(1234, Zlib.crc32(nil, 1234)) # was 0
assert_equal(1234, Zlib.adler32(nil, 1234)) # was 1
assert_equal(Zlib.adler32("", 2**31 - 1), Zlib.adler32(nil, 2**31 - 1))
assert_equal(0, Zlib.crc32(nil))
assert_equal(1, Zlib.adler32(nil))
end

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