summaryrefslogtreecommitdiff
path: root/libavcodec/msrle.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-10-21 14:40:14 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-10-24 23:15:24 +0200
commit203ccb8746997777ce66beadd53b4631d217b9cd (patch)
tree2403d6f32b7099d4e6e582b5734c39062e11bc32 /libavcodec/msrle.c
parent87588caf8cff318cd022ad5002304198c6ddbd51 (diff)
downloadffmpeg-203ccb8746997777ce66beadd53b4631d217b9cd.tar.gz
avcodec/msrle: Check that the input is large enough to contain a end of picture code
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>
Diffstat (limited to 'libavcodec/msrle.c')
-rw-r--r--libavcodec/msrle.c3
1 files changed, 3 insertions, 0 deletions
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;