From: Laurent Aimar <fenrir@videolan.org>
Date: Thu, 29 Sep 2011 20:38:01 +0000 (+0000)
Subject: xan: Check for out of bound reads in xan_huffman_decode()
X-Git-Tag: v0.8b1~1269
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3db3fdf4c669aed9379be430c17f151d4d0697c5;p=platform%2Fupstream%2Flibav.git

xan: Check for out of bound reads in xan_huffman_decode()

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
---

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index c71a718..3965617 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -112,7 +112,10 @@ static int xan_huffman_decode(unsigned char *dest, int dest_len,
     init_get_bits(&gb, ptr, ptr_len * 8);
 
     while ( val != 0x16 ) {
-        val = src[val - 0x17 + get_bits1(&gb) * byte];
+        unsigned idx = val - 0x17 + get_bits1(&gb) * byte;
+        if (idx >= 2 * byte)
+            return -1;
+        val = src[idx];
 
         if ( val < 0x16 ) {
             if (dest >= dest_end)