diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-24 22:21:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:19 +0200 |
| commit | 30102ee94e7d37d0feb11351ee8b70c3f714af66 (patch) | |
| tree | b3ac72e22e675b9115c0d502be3c39824457dc71 | |
| parent | 25ed23848012cf7ecf23f122118cabb62d3c2636 (diff) | |
| download | ffmpeg-30102ee94e7d37d0feb11351ee8b70c3f714af66.tar.gz | |
avcodec/exr: Check ymin vs. h
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>
(cherry picked from commit 3e5959b3457f7f1856d997261e6ac672bba49e8b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/exr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index ff71816e5a..8c3427c21b 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1723,7 +1723,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, ptr = picture->data[0]; // Zero out the start if ymin is not 0 - 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[0]; } |