diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 04:20:24 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-02-23 00:06:28 +0000 |
| commit | d6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b (patch) | |
| tree | 1909398b6bfda19f81dccf3929cb61abc7fc59fe | |
| parent | 51dd54c51aaca909893c9f90a4119e96ff71ffdf (diff) | |
| download | ffmpeg-d6deed7916f7f52dbfc88e2fc2c43e3cfb8ee74b.tar.gz | |
h264_cabac: Break infinite loops
This fixes out of array reads and/or infinite loops.
30 is the maximum number of bits that can be read into
coeff_abs below.
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2ee4bc01a8..7f86de58d3 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1719,7 +1719,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, \ if( coeff_abs >= 15 ) { \ int j = 0; \ - while( get_cabac_bypass( CC ) ) { \ + while (get_cabac_bypass(CC) && j < 30) { \ j++; \ } \ \ |