From 74bbf9bc8279e0b8eba89c8cca68e8ad7ff547ed Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 23 Sep 2019 23:52:04 +0200 Subject: [PATCH] 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 Signed-off-by: Michael Niedermayer --- libavcodec/adpcm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index fb126503d6..7f2ebfc99d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -111,6 +111,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;