diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-25 22:55:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-15 22:31:13 +0200 |
| commit | 7b7c582c15bebe458ebe44fa593271550293dac7 (patch) | |
| tree | 53ba2927d2cf5fed73198e4a34bc996ce78fe671 | |
| parent | 06b84f7271a013a32f213f89997317239671bd4d (diff) | |
| download | ffmpeg-7b7c582c15bebe458ebe44fa593271550293dac7.tar.gz | |
avcodec/ac3dec: Check that the number of channels with dependant streams is valid
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 <michael@niedermayer.cc>
(cherry picked from commit e3275f937dc38e740c74539f2f6aad5bfdba2bf1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ac3dec.c | 5 |
1 files changed, 5 insertions, 0 deletions
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); |