Fixes: left shift of 1 by 63 places cannot be represented in type 'long long' Fixes: out of array access Fixes: 7284/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_fuzzer-5767914968842240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> --- libavcodec/ac3dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 317b2bd800..dfa025cbcc 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1702,6 +1702,11 @@ dependent_frame: channel_layout |= custom_channel_map_locations[ch][1]; } } + if (av_get_channel_layout_nb_channels(channel_layout) > EAC3_MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels (%d) coded\n", + av_get_channel_layout_nb_channels(channel_layout)); + return AVERROR_INVALIDDATA; + } avctx->channel_layout = channel_layout; avctx->channels = av_get_channel_layout_nb_channels(channel_layout); -- 2.17.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
