generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

huffyuv: error out on bit overrun.

Browse Source 
On EOF, get_bits() will continuously return 0, causing an infinite
loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 84c202cc37)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Ronald S. Bultje
2012-02-17 15:00:47 -08:00
committed by Reinhard Tartler
parent 4509129e9d
commit 2380a3d37f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/huffyuv.c
View File

@@ -184,7 +184,7 @@ static int read_len_table(uint8_t *dst, GetBitContext *gb){
if(repeat==0) if(repeat==0)
repeat= get_bits(gb, 8); repeat= get_bits(gb, 8);
//printf("%d %d\n", val, repeat); //printf("%d %d\n", val, repeat);
if(i+repeat > 256) { if(i+repeat > 256 || get_bits_left(gb) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n"); av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n");
return -1; return -1;
} }