]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/exr: Check ymin vs. h
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 24 Oct 2020 20:21:48 +0000 (22:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 22 Nov 2020 16:45:17 +0000 (17:45 +0100)
Fixes: out of array access
Fixes: 26532/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5613925708857344
Fixes: 27443/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5631239813595136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/exr.c

index e907c5c46401093bc99f2496074dd2c8b0539a82..8b701d1cd298318524660841c614128f8c91b7db 100644 (file)
@@ -1830,7 +1830,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     // Zero out the start if ymin is not 0
     for (i = 0; i < planes; i++) {
         ptr = picture->data[i];
-        for (y = 0; y < s->ymin; y++) {
+        for (y = 0; y < FFMIN(s->ymin, s->h); y++) {
             memset(ptr, 0, out_line_size);
             ptr += picture->linesize[i];
         }