diff mbox

[FFmpeg-devel] avcodec/msrle: Check that the input is large enough to contain a end of picture code

Message ID 20181022194241.13245-1-michael@niedermayer.cc
State Accepted
Commit 203ccb8746997777ce66beadd53b4631d217b9cd
Headers show

Commit Message

Michael Niedermayer Oct. 22, 2018, 7:42 p.m. UTC 
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 | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer Oct. 24, 2018, 9:14 p.m. UTC | #1 
On Mon, Oct 22, 2018 at 09:42:41PM +0200, Michael Niedermayer wrote:
> 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 | 3 +++
>  1 file changed, 3 insertions(+)

will apply


[...]
diff mbox

Patch

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index adb55b1302..1ab8a41985 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -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;