Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 91c23bd

Browse filesBrowse files
committed
Fix another infinite loop similar to the previous one
1 parent 01a5712 commit 91c23bd
Copy full SHA for 91c23bd

File tree

Expand file treeCollapse file tree

3 files changed

+16
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+16
-1
lines changed
Open diff view settings
Collapse file

‎miniz_oxide/src/inflate/core.rs‎

Copy file name to clipboardExpand all lines: miniz_oxide/src/inflate/core.rs
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,10 @@ where
547547
code_len = res.1 as u32;
548548
};
549549

550+
if code_len == 0 {
551+
return Action::Jump(InvalidCodeLen);
552+
}
553+
550554
l.bit_buf >>= code_len as u32;
551555
l.num_bits -= code_len;
552556
f(r, l, symbol)
@@ -1077,6 +1081,7 @@ fn decompress_inner(
10771081
dist_from_out_buf_start: r.dist_from_out_buf_start,
10781082
};
10791083

1084+
10801085
let mut status = 'state_machine: loop {
10811086
match state {
10821087
Start => {
Collapse file

‎miniz_oxide/tests/test.rs‎

Copy file name to clipboardExpand all lines: miniz_oxide/tests/test.rs
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,18 @@ fn inf_issue_19() {
3131
let _ = decompress_to_vec(data.as_slice());
3232
}
3333

34+
/// Fuzzed (invalid )file that resulted in an infinite loop as inflate read a code as having 0
35+
/// length.
3436
#[test]
35-
fn decompress_oom() {
37+
fn decompress_zero_code_len_oom() {
38+
let data = get_test_file_data("tests/test_data/invalid_code_len_oom");
39+
let _ = decompress_to_vec(data.as_slice());
40+
}
41+
42+
/// Same problem as previous test but in the end of input huffman decode part of
43+
/// `decode_huffman_code`
44+
#[test]
45+
fn decompress_zero_code_len_2() {
3646
let data = get_test_file_data("tests/test_data/invalid_code_len_oom");
3747
let _ = decompress_to_vec(data.as_slice());
3848
}
Collapse file
6 Bytes
Binary file not shown.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.