diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-01 19:56:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-17 12:21:32 +0200 |
| commit | 372bb594385f97c31981e5ab5bf4c6cd56959102 (patch) | |
| tree | f0ece5047e4c4ba4c2cf68b5e778ec3174ea790c | |
| parent | d5b42af8e7ca5010f6eaebb3f17d1957734dbeb8 (diff) | |
| download | ffmpeg-372bb594385f97c31981e5ab5bf4c6cd56959102.tar.gz | |
avcodec/dirac_vlc: Fix invalid shift in ff_dirac_golomb_read_32bit()
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>
(cherry picked from commit c595139f1fdb5ce5ee128c317ed9e4e836282436)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dirac_vlc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c index 773f720858..b642ee8599 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; |