From: Anton Khirnov <anton@khirnov.net>
Date: Fri, 15 Nov 2013 14:33:20 +0000 (+0100)
Subject: motionpixels: clip VLC codes.
X-Git-Tag: v10_alpha1~204
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca41c72c6d9515d9045bd3b68104525dee81b8d0;p=platform%2Fupstream%2Flibav.git

motionpixels: clip VLC codes.

Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
---

diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index 8e7b3a4..6c1efad 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -180,6 +180,7 @@ static int mp_get_vlc(MotionPixelsContext *mp, GetBitContext *gb)
     int i;
 
     i = (mp->codes_count == 1) ? 0 : get_vlc2(gb, mp->vlc.table, mp->max_codes_bits, 1);
+    i = FFMIN(i, FF_ARRAY_ELEMS(mp->codes) - 1);
     return mp->codes[i].delta;
 }