[FFmpeg-cvslog] avcodec/ffv1dec_template: Check for the end of input after 1024 pixels

Michael Niedermayer git at videolan.org
Fri Oct 12 02:00:15 EEST 2018


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Oct  8 03:35:58 2018 +0200| [ccd2b20ad96c9d26ed27b4dabc08ea937987963e] | committer: Michael Niedermayer

avcodec/ffv1dec_template: Check for the end of input after 1024 pixels

Fixes: Timeout
Fixes: 10385/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5689206987292672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccd2b20ad96c9d26ed27b4dabc08ea937987963e
---

 libavcodec/ffv1dec_template.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c
index fecdbd0025..25032feda0 100644
--- a/libavcodec/ffv1dec_template.c
+++ b/libavcodec/ffv1dec_template.c
@@ -50,6 +50,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w,
     for (x = 0; x < w; x++) {
         int diff, context, sign;
 
+        if (!(x & 1023)) {
+            if (is_input_end(s))
+                return AVERROR_INVALIDDATA;
+        }
+
         context = RENAME(get_context)(p, sample[1] + x, sample[0] + x, sample[1] + x);
         if (context < 0) {
             context = -context;



More information about the ffmpeg-cvslog mailing list