diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-01 21:41:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-08 17:01:03 +0100 |
| commit | 2bc3811c0d6b34e43a55a7541722761f548628d0 (patch) | |
| tree | 8e3b0daa7bb256239a6e9649d6a73222bb8cddbc | |
| parent | 0cb1ccd1d18931427877277c8d1cd673f12a4d04 (diff) | |
| download | ffmpeg-2bc3811c0d6b34e43a55a7541722761f548628d0.tar.gz | |
avcodec/dxv: Check that there is enough data to decompress
Fixes: Timeout
Fixes: 10979/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-6178582203203584
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dxv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 08aca73b1f..bf53d7d706 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -1192,6 +1192,12 @@ static int dxv_decode(AVCodecContext *avctx, void *data, ret = decompress_tex(avctx); if (ret < 0) return ret; + { + int w_block = avctx->coded_width / ctx->texture_block_w; + int h_block = avctx->coded_height / ctx->texture_block_h; + if (w_block * h_block * ctx->tex_step > ctx->tex_size * 8LL) + return AVERROR_INVALIDDATA; + } tframe.f = data; ret = ff_thread_get_buffer(avctx, &tframe, 0); |