aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>2015-06-10 00:12:38 +0200
committerLuca Barbato <lu_zero@gentoo.org>2016-03-20 01:04:12 +0100
commita2d1922bde8db2cdac95051918fe81ae18c0376b (patch)
tree40104d5322a9b050bcccac880f100c24cd1cfdb4 /libavcodec
parent9765549f551ff40869aee1a6492b6a976c86cfe9 (diff)
downloadffmpeg-a2d1922bde8db2cdac95051918fe81ae18c0376b.tar.gz
takdec: ensure chan2 is a valid channel index
If chan2 is not smaller than the number of channels, it can cause segmentation faults due to dereferencing a NULL pointer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/takdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index c84cca448d..93098be7e4 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -806,6 +806,12 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
if (s->mcdparams[i].present) {
s->mcdparams[i].index = get_bits(gb, 2);
s->mcdparams[i].chan2 = get_bits(gb, 4);
+ if (s->mcdparams[i].chan2 >= avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR,
+ "invalid channel 2 (%d) for %d channel(s)\n",
+ s->mcdparams[i].chan2, avctx->channels);
+ return AVERROR_INVALIDDATA;
+ }
if (s->mcdparams[i].index == 1) {
if ((nbit == s->mcdparams[i].chan2) ||
(ch_mask & 1 << s->mcdparams[i].chan2))