Skip to content

Guard against uint32 overflow in byte-block skip/read limit checks #914

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

Guard against uint32 overflow in byte-block skip/read limit checks #914

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
6 changes: 4 additions & 2 deletions src/libFLAC/bitreader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,8 @@ FLAC__bool FLAC__bitreader_skip_byte_block_aligned_no_crc(FLAC__BitReader *br, u
FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(br));

if(br->read_limit_set && br->read_limit < (uint32_t)-1){
if(br->read_limit < nvals*8){
if(nvals > UINT32_MAX / 8 ||
br->read_limit < nvals*8){
br->read_limit = -1;
return false;
}
Expand Down Expand Up @@ -666,7 +667,8 @@ FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, F
FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(br));

if(br->read_limit_set && br->read_limit < (uint32_t)-1){
if(br->read_limit < nvals*8){
if(nvals > UINT32_MAX / 8 ||
br->read_limit < nvals*8){
br->read_limit = -1;
return false;
}
Expand Down