diff mbox

[FFmpeg-devel,1/3] avcodec/vp8: Check for bitstream end before vp7_fade_frame()

Message ID 20180217032054.21778-1-michael@niedermayer.cc
State Accepted
Commit de675648cef7e451ca82fabaee0d8ec1fe653311
Headers show

Commit Message

Michael Niedermayer Feb. 17, 2018, 3:20 a.m. UTC 
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>
---
 libavcodec/vp8.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Feb. 18, 2018, 11:47 a.m. UTC | #1 
On Sat, Feb 17, 2018 at 04:20:52AM +0100, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/vp8.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply patchset


[...]
diff mbox

Patch

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 7f71a75e4b..62b9f8bc2d 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -656,6 +656,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)