From edc88646ee407bc342cc94ff495aadafcd377cee Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 19 Jul 2017 00:59:21 +0200 Subject: avcodec/diracdec: Check dimensions which are closer to what is allocated in alloc_sequence_buffers() Fixes OOM Fixes: 2674/clusterfuzz-testcase-minimized-4999700518273024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/diracdec.c') diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index c031b40..71d0ff4 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -2090,7 +2090,10 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int return ret; } - ret = ff_set_dimensions(avctx, dsh->width, dsh->height); + if (CALC_PADDING((int64_t)dsh->width, MAX_DWT_LEVELS) * CALC_PADDING((int64_t)dsh->height, MAX_DWT_LEVELS) > avctx->max_pixels) + ret = AVERROR(ERANGE); + if (ret >= 0) + ret = ff_set_dimensions(avctx, dsh->width, dsh->height); if (ret < 0) { av_freep(&dsh); return ret; -- cgit v1.1