diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 20:37:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:48:04 +0100 |
| commit | 47e462eecc0a47ad40f59376199f93f227e21d13 (patch) | |
| tree | 0aa4d52980e0397e15c170d4ea763c1bae665ff2 | |
| parent | f3d16706060ab6ae6dc78f15359fab3fd87c9495 (diff) | |
| download | ffmpeg-47e462eecc0a47ad40f59376199f93f227e21d13.tar.gz | |
aacdec: check channel count
Prevent out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 96f452ac647dae33c53c242ef3266b65a9beafb6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/aacdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 239153a9f9..6c17c337f3 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -914,6 +914,11 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) } } + if (avctx->channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); + return AVERROR_INVALIDDATA; + } + AAC_INIT_VLC_STATIC( 0, 304); AAC_INIT_VLC_STATIC( 1, 270); AAC_INIT_VLC_STATIC( 2, 550); |