virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/wavdec: Fix overflow of intermediate in block_align check

Browse Source 
Fixes: signed integer overflow: -251517880 * 32 cannot be represented in type 'int'
Fixes: 385224934/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-4909298151915520

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-02-07 01:24:37 +01:00
parent 9fd23f712a
commit 1afbc40875
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/wavdec.c
View File

@ -912,10 +912,10 @@ static int w64_read_header(AVFormatContext *s)
if (st->codecpar->block_align && if (st->codecpar->block_align &&
st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS && st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS &&
st->codecpar->bits_per_coded_sample < 128) { st->codecpar->bits_per_coded_sample < 128) {
int block_align = st->codecpar->block_align; int64_t block_align = st->codecpar->block_align;
block_align = FFMAX(block_align, block_align = FFMAX(block_align,
((st->codecpar->bits_per_coded_sample + 7) / 8) * ((st->codecpar->bits_per_coded_sample + 7LL) / 8) *
st->codecpar->ch_layout.nb_channels); st->codecpar->ch_layout.nb_channels);
if (block_align > st->codecpar->block_align) { if (block_align > st->codecpar->block_align) {
av_log(s, AV_LOG_WARNING, "invalid block_align: %d, broken file.\n", av_log(s, AV_LOG_WARNING, "invalid block_align: %d, broken file.\n",