Commit c720b9ce authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/golomb: get_ur_golomb_jpegls: Fix reading huge k values

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4f2fcac2
...@@ -334,8 +334,16 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, ...@@ -334,8 +334,16 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
if (i < limit - 1) { if (i < limit - 1) {
if (k) { if (k) {
buf = SHOW_UBITS(re, gb, k); if (k > MIN_CACHE_BITS - 1) {
LAST_SKIP_BITS(re, gb, k); buf = SHOW_UBITS(re, gb, 16) << (k-16);
LAST_SKIP_BITS(re, gb, 16);
UPDATE_CACHE(re, gb);
buf |= SHOW_UBITS(re, gb, k-16);
LAST_SKIP_BITS(re, gb, k-16);
} else {
buf = SHOW_UBITS(re, gb, k);
LAST_SKIP_BITS(re, gb, k);
}
} else { } else {
buf = 0; buf = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment