virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avcodec/xsubdec: Check that RLE coded image and colors fit in the buffer

Browse Source 
Fixes: Timeout
Fixes: 1747/clusterfuzz-testcase-minimized-6035451213250560

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-05-23 00:20:25 +02:00
parent cfd1ecdc0b
commit 2002436b0c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/xsubdec.c
View File

@ -91,6 +91,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
// we just ignore it // we just ignore it
bytestream_get_le16(&buf); bytestream_get_le16(&buf);
if (buf_end - buf < h + 3*4)
return AVERROR_INVALIDDATA;
// allocate sub and set values // allocate sub and set values
sub->rects = av_mallocz(sizeof(*sub->rects)); sub->rects = av_mallocz(sizeof(*sub->rects));
if (!sub->rects) if (!sub->rects)