Skip to content

Fix inflate match output bound check #204

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

Fix inflate match output bound check #204

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
11 changes: 1 addition & 10 deletions miniz_oxide/src/inflate/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,17 +1905,8 @@ pub fn decompress_with_limit(
Action::Jump(DistanceOutOfBounds)
} else {
let out_pos = out_buf.position();
let source_pos = out_buf.position()
.wrapping_sub(l.dist as usize) & out_buf_size_mask;

let out_len = out_buf.bytes_left();
let match_end_pos = out_buf.position() + l.counter as usize;

if match_end_pos > out_len ||
// miniz doesn't do this check here. Not sure how it makes sure
// that this case doesn't happen.
(source_pos >= out_pos && (source_pos - out_pos) < l.counter as usize)
{
if l.counter as usize > out_buf.bytes_left() {
// Not enough space for all of the data in the output buffer,
// so copy what we have space for.
if l.counter == 0 {
Expand Down
Loading