RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/golomb: Fix undefined shifts in unsigned rice decoding code 

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-11 16:47:13 +01:00
parent 8c7a0932ab
commit 8617bc6ffa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/golomb.h
View File

@ -281,7 +281,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
if (log > 31 - limit) { if (log > 31 - limit) {
buf >>= log - k; buf >>= log - k;
buf += (30 - log) << k; buf += (30U - log) << k;
LAST_SKIP_BITS(re, gb, 32 + k - log); LAST_SKIP_BITS(re, gb, 32 + k - log);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
@ -317,7 +317,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
if (log - k >= 32 - MIN_CACHE_BITS + (MIN_CACHE_BITS == 32) && if (log - k >= 32 - MIN_CACHE_BITS + (MIN_CACHE_BITS == 32) &&
32 - log < limit) { 32 - log < limit) {
buf >>= log - k; buf >>= log - k;
buf += (30 - log) << k; buf += (30U - log) << k;
LAST_SKIP_BITS(re, gb, 32 + k - log); LAST_SKIP_BITS(re, gb, 32 + k - log);
CLOSE_READER(re, gb); CLOSE_READER(re, gb);