diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-11-15 21:17:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-02 00:28:59 +0100 |
| commit | 12aea29a95960603c6777982d363ed644cabfb9a (patch) | |
| tree | 8841fbf4008387cca4d3e493042e6d34a10ca47e | |
| parent | b8a10f10cc5ff6191bd63561cea740f6490366c3 (diff) | |
| download | ffmpeg-12aea29a95960603c6777982d363ed644cabfb9a.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 af92cb0070..df425b8cf3 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; } |