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

avcodec/qdrw: Check input for header/skiped space before get_buffer()

Browse Source 
Fixes: Timeout (21sec -> 0.8sec)
Fixes: 17990/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDRAW_fuzzer-5200374436200448

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 2019-10-07 16:14:32 +02:00
parent 8caa716667
commit b63fbc19c0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/qdrw.c
View File

@ -455,6 +455,8 @@ static int decode_frame(AVCodecContext *avctx,
avpriv_request_sample(avctx, "Pack type %d", pack_type); avpriv_request_sample(avctx, "Pack type %d", pack_type);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (bytestream2_get_bytes_left(&gbc) < 30)
return AVERROR_INVALIDDATA;
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
return ret; return ret;