highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/fic: Fail on invalid slice size/off

Browse Source 
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 30a7a81cdc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-12-16 21:43:07 +01:00
parent 5550946ff4
commit 5ed024e40b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/fic.c
View 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); slice_h = FFALIGN(avctx->height - ctx->slice_h * (nslices - 1), 16);
} else { } else {
slice_size = AV_RB32(src + tsize + FIC_HEADER_SIZE + slice * 4 + 4); 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) if (slice_size < slice_off || slice_size > msize)