diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2017-11-15 21:17:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-07 23:38:06 +0100 |
commit | 23d5f15b42fd63327c4ab938592832629a6b5980 (patch) | |
tree | 17a6360e50c5aec48bbd5d43d44f68ec6b02acec | |
parent | 77cfc820cfb5a7edad065c91a0f9650f0ce0dc90 (diff) | |
download | ffmpeg-23d5f15b42fd63327c4ab938592832629a6b5980.tar.gz |
avcodec/snowdec: Check for remaining bitstream in decode_blocks()
Fixes: Timeout
Fixes: 3142/clusterfuzz-testcase-5007853163118592
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 4527ec2216109867498edc3ac8a17fd879b5d017)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/snowdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index a828769610..a9bdb8da5e 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -437,6 +437,8 @@ static int decode_blocks(SnowContext *s){ for(y=0; y<h; y++){ for(x=0; x<w; x++){ + if (s->c.bytestream >= s->c.bytestream_end) + return AVERROR_INVALIDDATA; if ((res = decode_q_branch(s, 0, x, y)) < 0) return res; } |