aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-02-18 23:28:33 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-05 12:43:08 +0200
commit54ec335e83890aee325fe17267d951e78060c0f2 (patch)
tree0d2c9e2e1b235ed5b98ec5fb26d9702543e0ee5f /libavcodec/svq1dec.c
parent7db4f36291464ba81c75accd99c0279e6892463a (diff)
downloadffmpeg-54ec335e83890aee325fe17267d951e78060c0f2.tar.gz
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 <michael@niedermayer.cc> (cherry picked from commit 55e344ee5aa6f6e04e50bbac457e0ca53433ab75) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/svq1dec.c')
-rw-r--r--libavcodec/svq1dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index dca99fae4c..0485245a80 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;