aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-23 23:52:04 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-01-06 11:30:43 +0100
commit3f2f2b18c832c206456e2ef08131fa9cc7e682a5 (patch)
treeff5d3dca436d00a5fb7588397ab2d1aaeb24df54
parentc526fc591a96650489d6a0f365fb5249f15ac1bb (diff)
downloadffmpeg-3f2f2b18c832c206456e2ef08131fa9cc7e682a5.tar.gz
avcodec/adpcm: Check number of channels for MTAF
Fixes: out of array access Fixes: 17608/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_MTAF_fuzzer-5074936267276288 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 74bbf9bc8279e0b8eba89c8cca68e8ad7ff547ed) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/adpcm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index cd3bbd33c2..b0f8c11cb5 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -110,6 +110,10 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
case AV_CODEC_ID_ADPCM_MTAF:
min_channels = 2;
max_channels = 8;
+ if (avctx->channels & 1) {
+ avpriv_request_sample(avctx, "channel count %d\n", avctx->channels);
+ return AVERROR_PATCHWELCOME;
+ }
break;
case AV_CODEC_ID_ADPCM_PSX:
max_channels = 8;