Skip to content

Commit 6acfaa1

Browse files
committed
avformat/wavdec: Fix overflow of intermediate in block_align check
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> (cherry picked from commit 1afbc40) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
1 parent c388bc1 commit 6acfaa1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libavformat/wavdec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,10 @@ static int w64_read_header(AVFormatContext *s)
912912
if (st->codecpar->block_align &&
913913
st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS &&
914914
st->codecpar->bits_per_coded_sample < 128) {
915-
int block_align = st->codecpar->block_align;
915+
int64_t block_align = st->codecpar->block_align;
916916

917917
block_align = FFMAX(block_align,
918-
((st->codecpar->bits_per_coded_sample + 7) / 8) *
918+
((st->codecpar->bits_per_coded_sample + 7LL) / 8) *
919919
st->codecpar->ch_layout.nb_channels);
920920
if (block_align > st->codecpar->block_align) {
921921
av_log(s, AV_LOG_WARNING, "invalid block_align: %d, broken file.\n",

0 commit comments

Comments
 (0)