diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-07 16:14:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | ae1cc1089f665bbd65a574d905d44f007b254bf6 (patch) | |
| tree | 6039443508a2c4fd5485f030a628879e19356ba2 | |
| parent | fee64199d3c79a7832d6892e122cd62c23f32abc (diff) | |
| download | ffmpeg-ae1cc1089f665bbd65a574d905d44f007b254bf6.tar.gz | |
avcodec/qdrw: Check input for header/skiped space before get_buffer()
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>
(cherry picked from commit b63fbc19c09d0b42da4f83c21fcf362d6ed7c545)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qdrw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 2cf18869e1..0452086be3 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -285,6 +285,8 @@ static int decode_frame(AVCodecContext *avctx, avpriv_request_sample(avctx, "Pack type %d", pack_type); return AVERROR_PATCHWELCOME; } + if (bytestream2_get_bytes_left(&gbc) < 30) + return AVERROR_INVALIDDATA; if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; |