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

exr: fix out-of-bounds read

Browse Source 
channel_index can be -1.

This problem was introduced in commit
2dd7b46132.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit ffdc5d09e4)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-11-16 20:46:56 +01:00
parent cbc9d46066
commit c7d38efbc2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/exr.c
View File

@@ -1428,8 +1428,7 @@ static int decode_header(EXRContext *s)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (s->channel_offsets[channel_index] == -1){/* channel have not been previously assign */ if (channel_index >= 0 && s->channel_offsets[channel_index] == -1) { /* channel has not been previously assigned */
if (channel_index >= 0) {
if (s->pixel_type != EXR_UNKNOWN && if (s->pixel_type != EXR_UNKNOWN &&
s->pixel_type != current_pixel_type) { s->pixel_type != current_pixel_type) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
@@ -1438,7 +1437,6 @@ static int decode_header(EXRContext *s)
} }
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;
}
} }
s->channels = av_realloc(s->channels, s->channels = av_realloc(s->channels,