diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-17 04:20:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-19 02:52:16 +0100 |
| commit | 010dd0d26e5abd3c244f6680eb3bb0f3370b48db (patch) | |
| tree | bd33cdba9e6cb8859134d4a7c5c02e14e9d2c6c8 | |
| parent | 675e243949bcb331d5dc4f6fd72620a1200dbb40 (diff) | |
| download | ffmpeg-010dd0d26e5abd3c244f6680eb3bb0f3370b48db.tar.gz | |
avcodec/vp8: Check for bitstream end before vp7_fade_frame()
Fixes: Timeout
Fixes: 5653/clusterfuzz-testcase-5497680018014208
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 de675648cef7e451ca82fabaee0d8ec1fe653311)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp8.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 7511f4dfc9..06d768a576 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -605,6 +605,8 @@ static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si s->fade_present = vp8_rac_get(c); } + if (c->end <= c->buffer && c->bits >= 0) + return AVERROR_INVALIDDATA; /* E. Fading information for previous frame */ if (s->fade_present && vp8_rac_get(c)) { if ((ret = vp7_fade_frame(s ,c)) < 0) |