avcodec/exr: Check buf_size more completely
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 29 Dec 2017 02:00:19 +0000 (03:00 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 31 Jan 2018 21:56:15 +0000 (22:56 +0100)
Fixes: Out of heap array read
Fixes: 4683/clusterfuzz-testcase-minimized-6152313673613312

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 903be5e4f66268273dc6e3c42a7fdeaab32066ef)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/exr.c

index 4000068..a62a4c8 100644 (file)
@@ -846,7 +846,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
 
     line_offset = AV_RL64(s->gb.buffer + jobnr * 8);
     // Check if the buffer has the required bytes needed from the offset
-    if (line_offset > buf_size - 8)
+    if (buf_size < 8 || line_offset > buf_size - 8)
         return AVERROR_INVALIDDATA;
 
     src  = buf + line_offset + 8;
@@ -855,7 +855,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
         return AVERROR_INVALIDDATA;
 
     data_size = AV_RL32(src - 4);
-    if (data_size <= 0 || data_size > buf_size)
+    if (data_size <= 0 || data_size > buf_size - line_offset - 8)
         return AVERROR_INVALIDDATA;
 
     s->ysize          = FFMIN(s->scan_lines_per_block, s->ymax - line + 1);