From f1f78e3cf4da658225067d9ef35cdb25541e5fe2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 30 Sep 2022 00:44:31 +0200 Subject: [PATCH] avcodec/mlpdec: add max channels check Fixes: out of array access Fixes: 51648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-4644322217164800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 635f92895c..0b0eb75990 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -547,6 +547,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, return AVERROR_PATCHWELCOME; } + if (max_channel + 1 > MAX_CHANNELS || max_channel + 1 < min_channel) + return AVERROR_INVALIDDATA; + s->min_channel = min_channel; s->max_channel = max_channel; s->coded_channels = ((1LL << (max_channel - min_channel + 1)) - 1) << min_channel;