[FFmpeg-cvslog] avcodec/loco: Check for end of input in the first line

Michael Niedermayer git at videolan.org
Thu Sep 26 22:06:23 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Sep 25 21:48:26 2019 +0200| [c5a52eb5cd5613cfede81648a58cd95088d0a3a7] | committer: Michael Niedermayer

avcodec/loco: Check for end of input in the first line

Fixes: Timeout (85sec -> 0.1sec)
Fixes: 17634/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5666410809786368

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

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

 libavcodec/loco.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index d8bf68a100..e891d83ece 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -155,6 +155,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh
     /* restore top line */
     for (i = 1; i < width; i++) {
         val = loco_get_rice(&rc);
+        if (val == INT_MIN)
+           return AVERROR_INVALIDDATA;
         data[i] = data[i - 1] + val;
     }
     data += stride;



More information about the ffmpeg-cvslog mailing list