Commit df66540d authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/proresdec2: SKIP_BITS() does not work with len=32

Fixes: invalid shift
Fixes: 3482/clusterfuzz-testcase-minimized-5446915875405824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c37138e0)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent c665a934
...@@ -264,7 +264,7 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons ...@@ -264,7 +264,7 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons
\ \
if (q > switch_bits) { /* exp golomb */ \ if (q > switch_bits) { /* exp golomb */ \
bits = exp_order - switch_bits + (q<<1); \ bits = exp_order - switch_bits + (q<<1); \
if (bits > MIN_CACHE_BITS) \ if (bits > FFMIN(MIN_CACHE_BITS, 31)) \
return AVERROR_INVALIDDATA; \ return AVERROR_INVALIDDATA; \
val = SHOW_UBITS(re, gb, bits) - (1 << exp_order) + \ val = SHOW_UBITS(re, gb, bits) - (1 << exp_order) + \
((switch_bits + 1) << rice_order); \ ((switch_bits + 1) << rice_order); \
......
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