Hi, On Jun 11, 2012 10:33 AM, "Justin Ruggles" <[email protected]> wrote: > > Fixes infinite loop in FLAC decoding in case of a truncated bitstream due to > the safe bitstream reader returning 0's at the end. > > Fixes Bug 310. > --- > libavcodec/golomb.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h > index 1712540..b6b8cc8 100644 > --- a/libavcodec/golomb.h > +++ b/libavcodec/golomb.h > @@ -301,7 +301,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int > return buf; > }else{ > int i; > - for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) { > + for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0 && HAVE_BITS_REMAINING(re, gb); i++) { > LAST_SKIP_BITS(re, gb, 1); > UPDATE_CACHE(re, gb); > }
Lgtm. Ronald
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
