From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 16 Dec 2018 20:43:07 +0000 (+0100)
Subject: avcodec/fic: Fail on invalid slice size/off
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=30a7a81cdc2ee2eac6d3271439c43f11b7327b3e;p=ffmpeg

avcodec/fic: Fail on invalid slice size/off

Fixes: Timeout
Fixes: 11486/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FIC_fuzzer-5677133863583744

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index dcf07776742..3e363463589 100644
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -380,6 +380,8 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
             slice_h      = FFALIGN(avctx->height - ctx->slice_h * (nslices - 1), 16);
         } else {
             slice_size = AV_RB32(src + tsize + FIC_HEADER_SIZE + slice * 4 + 4);
+            if (slice_size < slice_off)
+                return AVERROR_INVALIDDATA;
         }
 
         if (slice_size < slice_off || slice_size > msize)