From 3db3fdf4c669aed9379be430c17f151d4d0697c5 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Thu, 29 Sep 2011 20:38:01 +0000 Subject: xan: Check for out of bound reads in xan_huffman_decode() Signed-off-by: Janne Grunau --- libavcodec/xan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/xan.c') diff --git a/libavcodec/xan.c b/libavcodec/xan.c index c71a718537..3965617838 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) -- cgit v1.2.3