Skip to content
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

Fix signed integer overflow in seeking code #745

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Fix signed integer overflow in seeking code #745

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
3 changes: 2 additions & 1 deletion src/libFLAC/stream_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3597,7 +3597,8 @@ FLAC__bool seek_to_absolute_sample_(FLAC__StreamDecoder *decoder, FLAC__uint64 s
/* check if the bounds are still ok */
if (lower_bound_sample >= upper_bound_sample ||
lower_bound > upper_bound ||
upper_bound >= INT64_MAX) {
upper_bound >= INT64_MAX ||
target_sample > upper_bound_sample) {
decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
return false;
}
Expand Down
16 changes: 10 additions & 6 deletions src/test_seeking/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,9 @@ static void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDeco

/* read mode:
* 0 - no read after seek
* 1 - read 2 frames
* 2 - read until end
* 1 - read 2 frames after seek
* 2 - read until end after seek
* 3 - don't process whole stream first - read 2 frames after seek
*/
static FLAC__bool seek_barrage(FLAC__bool is_ogg, const char *filename, FLAC__off_t filesize, uint32_t count, FLAC__int64 total_samples, uint32_t read_mode, FLAC__int32 **pcm)
{
Expand Down Expand Up @@ -302,19 +303,20 @@ static FLAC__bool seek_barrage(FLAC__bool is_ogg, const char *filename, FLAC__of
if(!FLAC__stream_decoder_process_until_end_of_metadata(decoder))
return die_s_("FLAC__stream_decoder_process_until_end_of_metadata() FAILED", decoder);

if(!is_ogg) { /* not necessary to do this for Ogg because of its seeking method */
if(!is_ogg && read_mode < 3) { /* not necessary to do this for Ogg because of its seeking method */
/* process until end of stream to make sure we can still seek in that state */
decoder_client_data.quiet = true;
decoder_client_data.last_seek_target = 0;
if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
return die_s_("FLAC__stream_decoder_process_until_end_of_stream() FAILED", decoder);
decoder_client_data.quiet = false;

printf("stream decoder state is %s\n", FLAC__stream_decoder_get_resolved_state_string(decoder));
if(FLAC__stream_decoder_get_state(decoder) != FLAC__STREAM_DECODER_END_OF_STREAM)
return die_s_("expected FLAC__STREAM_DECODER_END_OF_STREAM", decoder);
}

printf("stream decoder state is %s\n", FLAC__stream_decoder_get_resolved_state_string(decoder));

n = (long int)decoder_client_data.total_samples;

if(total_samples > n)
Expand Down Expand Up @@ -456,12 +458,14 @@ int main(int argc, char *argv[])

(void) signal(SIGINT, our_sigint_handler_);

for (read_mode = 0; ok && read_mode <= 2; read_mode++) {
for (read_mode = 0; ok && read_mode <= 3; read_mode++) {
/* no need to do "decode all" read_mode if PCM checking is available */
if (rawfilename && read_mode > 1)
if (rawfilename && read_mode == 2)
continue;
if (strlen(flacfilename) > 4 && (0 == strcmp(flacfilename+strlen(flacfilename)-4, ".oga") || 0 == strcmp(flacfilename+strlen(flacfilename)-4, ".ogg"))) {
#if FLAC__HAS_OGG
if(read_mode == 3)
continue;
ok = seek_barrage(/*is_ogg=*/true, flacfilename, flacfilesize, count, samples, read_mode, rawfilename? pcm : 0);
#else
fprintf(stderr, "ERROR: Ogg FLAC not supported\n");
Expand Down
Loading