Module: libav Branch: release/0.8 Commit: 91355bec88ceb3622ea26f4d50126e6d5ea17d91
Author: Luca Barbato <[email protected]> Committer: Sean McGovern <[email protected]> Date: Wed Aug 14 16:57:21 2013 +0200 h261: check the mtype index Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit c59967fa7cc5bc2fa06b36c17d2c207240c06b3e) Signed-off-by: Luca Barbato <[email protected]> Conflicts: libavcodec/h261dec.c --- libavcodec/h261dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 665cc0d..70347bb 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -286,6 +286,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(h261_mtype_map)) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid mtype index %d\n", + h->mtype); + return SLICE_ERROR; + } h->mtype = h261_mtype_map[h->mtype]; // Read mquant _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
