[FFmpeg-cvslog] golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.

Ronald S. Bultje git at videolan.org
Sat Feb 25 04:28:17 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri Feb 17 12:54:37 2012 -0800| [46b3fbc30b7aaf7fdd52391734cfd6d93af8720a] | committer: Ronald S. Bultje

golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46b3fbc30b7aaf7fdd52391734cfd6d93af8720a
---

 libavcodec/golomb.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 5f720c0..1712540 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;



More information about the ffmpeg-cvslog mailing list