diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-29 20:38:01 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:31 +0100 |
| commit | 49007b494eaf7727e445a62a4eb040b080a91f00 (patch) | |
| tree | 552fd034e3e3f59396297c24c0a9e8fb8a53d805 | |
| parent | 0277c82de21c22d4d5438e0054f377b3fe2357de (diff) | |
| download | ffmpeg-49007b494eaf7727e445a62a4eb040b080a91f00.tar.gz | |
xan: Check for out of bound reads in xan_huffman_decode()
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 3db3fdf4c669aed9379be430c17f151d4d0697c5)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/xan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 26c6db50c8..2b3a4090c2 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) |