]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/msrle: Check that the input is large enough to contain a end of picture code
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 21 Oct 2018 12:40:14 +0000 (14:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 24 Oct 2018 21:15:24 +0000 (23:15 +0200)
Fixes: Timeout
Fixes: 10625/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSRLE_fuzzer-5659651283091456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/msrle.c

index adb55b1302c0762de53852731946068ff15ea7f9..1ab8a419851f82ffc8c3f4ae765ff77839590cf9 100644 (file)
@@ -95,6 +95,9 @@ static int msrle_decode_frame(AVCodecContext *avctx,
     s->buf = buf;
     s->size = buf_size;
 
+    if (buf_size < 2) //Minimally a end of picture code should be there
+        return AVERROR_INVALIDDATA;
+
     if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
         return ret;