diff mbox

[FFmpeg-devel,3/3] avcodec/dirac_vlc: Fix invalid shift in ff_dirac_golomb_read_32bit()

Message ID 20170901175612.18603-3-michael@niedermayer.cc
State Accepted
Commit c595139f1fdb5ce5ee128c317ed9e4e836282436
Headers show

Commit Message

Michael Niedermayer Sept. 1, 2017, 5:56 p.m. UTC 
Fixes: runtime error: shift exponent 64 is too large for 64-bit type 'residual' (aka 'unsigned long')
Fixes: 2838/clusterfuzz-testcase-minimized-6260066086813696

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dirac_vlc.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c
index d3b9900beb..bd37f31f46 100644
--- a/libavcodec/dirac_vlc.c
+++ b/libavcodec/dirac_vlc.c
@@ -56,6 +56,9 @@  int ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf,
         if ((c_idx + 1) > coeffs)
             return c_idx;
 
+        if (res_bits >= RSIZE_BITS)
+            res_bits = res = 0;
+
         /* res_bits is a hint for better branch prediction */
         if (res_bits && l->sign) {
             int32_t coeff = 1;