From c59967fa7cc5bc2fa06b36c17d2c207240c06b3e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 14 Aug 2013 16:57:21 +0200 Subject: [PATCH] h261: check the mtype index Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org --- libavcodec/h261dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 8872c6c2f6..2832c622e8 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -376,6 +376,11 @@ static int h261_decode_mb(H261Context *h) // Read mtype h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2); + if (h->mtype < 0 || h->mtype >= FF_ARRAY_ELEMS(ff_h261_mtype_map)) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid mtype index %d\n", + h->mtype); + return SLICE_ERROR; + } h->mtype = ff_h261_mtype_map[h->mtype]; // Read mquant