diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-26 15:40:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:56 +0100 |
| commit | a4c6ba7ea7986d11dcc48284f2c5f43395f4c47e (patch) | |
| tree | 7f10558991fe9559ad5c305380f6c0367397b2c0 | |
| parent | f6c9c455b6d10b23193a1398106226cebc7a5dd6 (diff) | |
| download | ffmpeg-a4c6ba7ea7986d11dcc48284f2c5f43395f4c47e.tar.gz | |
avcodec/exr: Allow duplicate use of channel indexes
Fixes: Ticket #8203
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 080819b3b4b59ef498511ac349414af85728349c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/exr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 0f8b0fda9f..819837f024 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1307,6 +1307,7 @@ static int decode_header(EXRContext *s, AVFrame *frame) int magic_number, version, i, flags, sar = 0; int layer_match = 0; int ret; + int dup_channels = 0; s->current_channel_offset = 0; s->xmin = ~0; @@ -1465,10 +1466,12 @@ 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, + av_log(s->avctx, AV_LOG_WARNING, "Multiple channels with index %d.\n", channel_index); - ret = AVERROR_INVALIDDATA; - goto fail; + if (++dup_channels > 10) { + ret = AVERROR_INVALIDDATA; + goto fail; + } } s->channels = av_realloc(s->channels, |