diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-17 12:54:37 -0800 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-02-26 10:03:14 +0100 |
| commit | e43bd4fa58b8e72eedad9a1c160b12bf8915d45e (patch) | |
| tree | 967ff19213604a9573db676962eddc5d558f116f | |
| parent | 25b4ed053f0e4c48b4b4afdcf84306bbd7752314 (diff) | |
| download | ffmpeg-e43bd4fa58b8e72eedad9a1c160b12bf8915d45e.tar.gz | |
golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 46b3fbc30b7aaf7fdd52391734cfd6d93af8720a)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/golomb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index e19064c642..0deab87a36 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -135,7 +135,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){ ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf]; UPDATE_CACHE(re, gb); buf = GET_CACHE(re, gb); - } while (ret); + } while (HAVE_BITS_REMAINING(re, gb)); CLOSE_READER(re, gb); return ret - 1; |