summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-10-07 16:14:32 +0200
committerMichael Niedermayer <[email protected]>2019-11-11 20:18:48 +0100
commitb4ff22f26bb687eb09d82e6242186b5163d36da5 (patch)
tree28645a8e846979c720da8f08f8a8d724662eb52f
parent4404729de7177a9fbb705cfd3d35cc60d2c6c4a0 (diff)
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 <[email protected]> (cherry picked from commit b63fbc19c09d0b42da4f83c21fcf362d6ed7c545) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/qdrw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 82cc528a30..03865fe10f 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -453,6 +453,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;