Skip to content

F
ffmpeg.wasm-core
Commit c58d45e0 authored by Laurent Aimar's avatar Laurent Aimar Committed by Michael Niedermayer
Browse files
Options

segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer. 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7cbe0257
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
libavformat/segafilm.c
View file @ c58d45e0
......@@ -113,12 +113,15 @@ static int film_read_header(AVFormatContext *s,
film->audio_bits = scratch[22];
if (scratch[23] == 2)
film->audio_type = CODEC_ID_ADPCM_ADX;
else if (film->audio_bits == 8)
else if (film->audio_channels > 0) {
if (film->audio_bits == 8)
film->audio_type = CODEC_ID_PCM_S8;
else if (film->audio_bits == 16)
film->audio_type = CODEC_ID_PCM_S16BE;
else
film->audio_type = CODEC_ID_NONE;
} else
film->audio_type = CODEC_ID_NONE;
}
if (AV_RB32(&scratch[0]) != FDSC_TAG)
......@@ -201,7 +204,7 @@ static int film_read_header(AVFormatContext *s,
if (film->audio_type == CODEC_ID_ADPCM_ADX)
audio_frame_counter += (film->sample_table[i].sample_size * 32 /
(18 * film->audio_channels));
else
else if (film->audio_type != CODEC_ID_NONE)
audio_frame_counter += (film->sample_table[i].sample_size /
(film->audio_channels * film->audio_bits / 8));
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment