highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/exr: Allow duplicate use of channel indexes

Browse Source 
Fixes: Ticket #8203

Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 080819b3b4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-09-26 15:40:30 +02:00
parent f6c9c455b6
commit a4c6ba7ea7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/exr.c
View File

@@ -1307,6 +1307,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
int magic_number, version, i, flags, sar = 0; int magic_number, version, i, flags, sar = 0;
int layer_match = 0; int layer_match = 0;
int ret; int ret;
int dup_channels = 0;
s->current_channel_offset = 0; s->current_channel_offset = 0;
s->xmin = ~0; s->xmin = ~0;
@@ -1465,10 +1466,12 @@ static int decode_header(EXRContext *s, AVFrame *frame)
s->pixel_type = current_pixel_type; s->pixel_type = current_pixel_type;
s->channel_offsets[channel_index] = s->current_channel_offset; s->channel_offsets[channel_index] = s->current_channel_offset;
} else if (channel_index >= 0) { } 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); "Multiple channels with index %d.\n", channel_index);
ret = AVERROR_INVALIDDATA; if (++dup_channels > 10) {
goto fail; ret = AVERROR_INVALIDDATA;
goto fail;
}
} }
s->channels = av_realloc(s->channels, s->channels = av_realloc(s->channels,