aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-14 13:01:46 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-17 16:11:57 +0100
commit09dad52390025b8ab73c4196cd616a7e4410cf32 (patch)
tree7f485455a3f01cac066eb9d209503461b01ef050
parenta3c66132d957db7f146601ac35f31944b0e5d98f (diff)
downloadffmpeg-09dad52390025b8ab73c4196cd616a7e4410cf32.tar.gz
avcodec/exr: Check remaining bits in last get code loop
Fixes: runtime error: shift exponent -7 is negative Fixes: 3902/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6081926122176512 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 dd8351b1184b8054925c28ecc5fcb6dbbc177fad) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/exr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index a62a4c8a6f..329db66149 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -537,7 +537,7 @@ static int huf_decode(const uint64_t *hcode, const HufDec *hdecod,
while (lc > 0) {
const HufDec pl = hdecod[(c << (HUF_DECBITS - lc)) & HUF_DECMASK];
- if (pl.len) {
+ if (pl.len && lc >= pl.len) {
lc -= pl.len;
get_code(pl.lit, rlc, c, lc, gb, out, oe, outb);
} else {