[libav-commits] golomb: avoid infinite loop on all-zero input (or end of buffer).
Ronald S. Bultje
git at libav.org
Sun Apr 1 19:04:57 CEST 2012
Module: libav
Branch: release/0.7
Commit: 3b5e1494c6e4bee4a0823b02d1342185252461d6
Author: Ronald S. Bultje <rsbultje at gmail.com>
Committer: Reinhard Tartler <siretart at tauware.de>
Date: Tue Feb 14 11:50:57 2012 -0800
golomb: avoid infinite loop on all-zero input (or end of buffer).
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit c6643fddba73560f26f90d327c84d8832222a720)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
---
libavcodec/golomb.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 503aa14..e19064c 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -123,7 +123,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
}else{
int ret = 1;
- while (1) {
+ do {
buf >>= 32 - 8;
LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
@@ -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);
CLOSE_READER(re, gb);
return ret - 1;
More information about the libav-commits
mailing list