aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-01-06 01:38:21 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-04-23 21:29:01 +0200
commit92503fd8a940d56b5b327b914a7f418a67254bec (patch)
tree0d7dfc157bfcc7921b116f8bf904fe0c671c117b /libavcodec
parent4591046007890a5a442931d0074ce0546b8c8f89 (diff)
downloadffmpeg-92503fd8a940d56b5b327b914a7f418a67254bec.tar.gz
avcodec/vmdaudio: Check block_align more
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 19788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VMDAUDIO_fuzzer-5743379690553344 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 06f6857b54a7fbbd087b0803f75bed44abed50d9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vmdaudio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c
index c7826fa3ce..dfbd49fd84 100644
--- a/libavcodec/vmdaudio.c
+++ b/libavcodec/vmdaudio.c
@@ -76,7 +76,9 @@ static av_cold int vmdaudio_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n");
return AVERROR(EINVAL);
}
- if (avctx->block_align < 1 || avctx->block_align % avctx->channels) {
+ if (avctx->block_align < 1 || avctx->block_align % avctx->channels ||
+ avctx->block_align > INT_MAX - avctx->channels
+ ) {
av_log(avctx, AV_LOG_ERROR, "invalid block align\n");
return AVERROR(EINVAL);
}