wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/mjpegdec: Check that reference frame matches the current frame

Browse source 
Fixes: out of array read
Fixes: 2097/clusterfuzz-testcase-minimized-5036861833609216

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 4705edbbb9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-06-05 22:23:15 +02:00
parent d37559993f
commit b6b70060ba
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libavcodec/mjpegdec.c
View file

@ -1469,6 +1469,15 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
return -1;
}
if (reference) {
if (reference->width != s->picture_ptr->width ||
reference->height != s->picture_ptr->height ||
reference->format != s->picture_ptr->format) {
av_log(s->avctx, AV_LOG_ERROR, "Reference mismatching\n");
return AVERROR_INVALIDDATA;
}
}
av_assert0(s->picture_ptr->data[0]);
/* XXX: verify len field validity */
len = get_bits(&s->gb, 16);