diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-19 13:07:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-25 03:29:35 +0200 |
| commit | 77f978996bd55f8ee22ced3accb6264cbbc36859 (patch) | |
| tree | e874d85f5f29dceb8b3fdedaa2d215b535ab8478 | |
| parent | 4770eac663da306fc8298ff8b73ebeabdc23489c (diff) | |
| download | ffmpeg-77f978996bd55f8ee22ced3accb6264cbbc36859.tar.gz | |
avcodec/indeo2: check ctab
Fixes out of array access
Fixes: 6b73fa392ac808f02e95a4e0a5770026/asan_static-oob_1b15f9a_1969_e7778535e5f27225fe0d6ded14721430.AVI
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9ffe44c5c75c485b4cbb12751e228f18da219df3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/indeo2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 17f236761d..7ad686d50b 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -171,6 +171,12 @@ static int ir2_decode_frame(AVCodecContext *avctx, ltab = buf[0x22] & 3; ctab = buf[0x22] >> 2; + + if (ctab > 3) { + av_log(avctx, AV_LOG_ERROR, "ctab %d is invalid\n", ctab); + return AVERROR_INVALIDDATA; + } + if (s->decode_delta) { /* intraframe */ if ((ret = ir2_decode_plane(s, avctx->width, avctx->height, p->data[0], p->linesize[0], |