avcodec/fic: Fail on invalid slice size/off
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 16 Dec 2018 20:43:07 +0000 (21:43 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 21 Mar 2019 09:42:51 +0000 (10:42 +0100)
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>
(cherry picked from commit 30a7a81cdc2ee2eac6d3271439c43f11b7327b3e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/fic.c

index c288c97..0b491ef 100644 (file)
@@ -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)