diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-16 21:43:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-01-21 07:53:26 +0100 |
| commit | 5ed024e40bdbc0047d7cad38f6b7d52903dbc108 (patch) | |
| tree | 83eda27aa30751e2dc1a3ba45aef0f21d6377ceb | |
| parent | 5550946ff4bdb4f6092e6aabd8d11888695ffbd0 (diff) | |
| download | ffmpeg-5ed024e40bdbc0047d7cad38f6b7d52903dbc108.tar.gz | |
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>
(cherry picked from commit 30a7a81cdc2ee2eac6d3271439c43f11b7327b3e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/fic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/fic.c b/libavcodec/fic.c index dcf0777674..3e36346358 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) |