summaryrefslogtreecommitdiffstats
path: root/libavcodec/dxtory.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-03-16 11:02:48 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-03-25 13:20:29 +0100
commitd92034a06aadd057b3d3b08a1bd3cb8b1aab0898 (patch)
tree5250970c755f8e0a5e13573a3726aa51c33e664e /libavcodec/dxtory.c
parent1223696c725a8ea7e80498e6ccfab37eea179b76 (diff)
downloadffmpeg-streaming-d92034a06aadd057b3d3b08a1bd3cb8b1aab0898.zip
ffmpeg-streaming-d92034a06aadd057b3d3b08a1bd3cb8b1aab0898.tar.gz
avcodec/dxtory: Check slice sizes before allocating image
Fixes: Timeout (26sec -> 2sec) Fixes: 13612/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5676845977042944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dxtory.c')
-rw-r--r--libavcodec/dxtory.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 285ca38..7024b31 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -272,10 +272,11 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
setup_lru_func setup_lru,
enum AVPixelFormat fmt)
{
- GetByteContext gb;
+ GetByteContext gb, gb_check;
GetBitContext gb2;
int nslices, slice, line = 0;
uint32_t off, slice_size;
+ uint64_t off_check;
uint8_t lru[3][8];
int ret;
@@ -283,6 +284,13 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
if (ret < 0)
return ret;
+ off_check = off;
+ gb_check = gb;
+ for (slice = 0; slice < nslices; slice++)
+ off_check += bytestream2_get_le32(&gb_check);
+ if (off_check - avctx->discard_damaged_percentage*off_check/100 > src_size)
+ return AVERROR_INVALIDDATA;
+
avctx->pix_fmt = fmt;
if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
return ret;
OpenPOWER on IntegriCloud