diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-17 23:16:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 13:12:12 +0100 |
| commit | 0af0a80cef0eae709b727896e92b44382c3feca8 (patch) | |
| tree | f2d031e4c1f22003a74897192af947a13e9987a1 | |
| parent | fd61b42b4c8709a7888fa5c9cce0c19d754e39fc (diff) | |
| download | ffmpeg-0af0a80cef0eae709b727896e92b44382c3feca8.tar.gz | |
avformat/wavdec: Check block_align vs. channels before combining them
Fixes: signed integer overflow: 65535 * 65312 cannot be represented in type 'int'
Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-6606935226974208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/wavdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 2fba9a08c8..256c36ebe2 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -643,7 +643,8 @@ break_loop: } else if (st->codecpar->codec_id == AV_CODEC_ID_XMA1 || st->codecpar->codec_id == AV_CODEC_ID_XMA2) { st->codecpar->block_align = 2048; - } else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS && st->codecpar->channels > 2) { + } else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS && st->codecpar->channels > 2 && + st->codecpar->block_align < INT_MAX / st->codecpar->channels) { st->codecpar->block_align *= st->codecpar->channels; } |