From 87a54e150e9cb6479e590faaf66d9f405a97fb6c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 12 May 2019 22:06:30 +0200 Subject: avcodec/cinepak: Check available input against encoded buffer size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: Timeout (12sec -> 2sec) Fixes: 14606/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5738687561728000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Tomas Härdin Signed-off-by: Michael Niedermayer --- libavcodec/cinepak.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index a5132dd..aeb15de 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -323,6 +323,9 @@ static int cinepak_predecode_check (CinepakContext *s) num_strips = AV_RB16 (&s->data[8]); encoded_buf_size = AV_RB24(&s->data[1]); + if (s->size < encoded_buf_size * (int64_t)(100 - s->avctx->discard_damaged_percentage) / 100) + return AVERROR_INVALIDDATA; + /* if this is the first frame, check for deviant Sega FILM data */ if (s->sega_film_skip_bytes == -1) { if (!encoded_buf_size) { -- cgit v1.1