Commit 9570322a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/dxtory: Check slice_size against minimum in dxtory_decode_v2()

Fixes: Timeout (33sec -> 16 milli sec)
Fixes: 14181/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5681840708386816

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent fee66610
......@@ -286,8 +286,14 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
off_check = off;
gb_check = gb;
for (slice = 0; slice < nslices; slice++)
off_check += bytestream2_get_le32(&gb_check);
for (slice = 0; slice < nslices; slice++) {
slice_size = bytestream2_get_le32(&gb_check);
if (slice_size <= 16 + (avctx->height * avctx->width / (8 * nslices)))
return AVERROR_INVALIDDATA;
off_check += slice_size;
}
if (off_check - avctx->discard_damaged_percentage*off_check/100 > src_size)
return AVERROR_INVALIDDATA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment