diff options
| author | Michael Niedermayer <[email protected]> | 2018-12-25 18:41:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-03-21 10:42:51 +0100 |
| commit | 6c2b4c716b1b5a0a2b8ec98465abcd85f6ccf9a5 (patch) | |
| tree | 4edc46128c84864d049254097a6d631eccf0ae0f | |
| parent | 96ef96f6ba8f43e00b631506b78fc6afcbe4e3f8 (diff) | |
avcodec/exr: Check for duplicate channel index
Fixes: Out of memory
Fixes: 11582/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5730204559867904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit f9728feaf90eb7493f8872356f54150efafb59cc)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/exr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 5253cc3f13..13755e1e6e 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1463,6 +1463,11 @@ static int decode_header(EXRContext *s, AVFrame *frame) } s->pixel_type = current_pixel_type; s->channel_offsets[channel_index] = s->current_channel_offset; + } else if (channel_index >= 0) { + av_log(s->avctx, AV_LOG_ERROR, + "Multiple channels with index %d.\n", channel_index); + ret = AVERROR_INVALIDDATA; + goto fail; } s->channels = av_realloc(s->channels, |