From ec3cd74f2dab8e3e8234ccb994132b23d3098585 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 2 Mar 2012 15:58:14 +0100
Subject: [PATCH] h261: check mtype.

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/h261dec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 3c634cc9d4..68e3212a19 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -286,6 +286,10 @@ 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) {
+        av_log(s->avctx, AV_LOG_ERROR, "illegal mtype %d\n", h->mtype);
+        return SLICE_ERROR;
+    }
     h->mtype = h261_mtype_map[h->mtype];
 
     // Read mquant