summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2020-02-18 23:28:33 +0100
committerMichael Niedermayer <[email protected]>2020-05-19 17:17:36 +0200
commit602caf11c2dc1f57ea699f01286e2914b89e3f0a (patch)
tree97aedb9b44380ae679f5311e76c663dcba7ac5d7
parent726904b6d0a3353e726c06c8480351c83121bf9d (diff)
avcodec/svq1dec: Check that there is data left after the header
Fixes: Timeout (21sec -> 255ms) Fixes: 20709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SVQ1_fuzzer-5085075089915904 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 55e344ee5aa6f6e04e50bbac457e0ca53433ab75) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/svq1dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index d3e60c3a4a..b61ae348d2 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -602,6 +602,8 @@ static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame)
if (skip_1stop_8data_bits(bitbuf) < 0)
return AVERROR_INVALIDDATA;
}
+ if (get_bits_left(bitbuf) <= 0)
+ return AVERROR_INVALIDDATA;
s->width = width;
s->height = height;