diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-27 19:25:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-17 10:48:27 +0200 |
| commit | adae546f2462006c6deae63ecd6402c3a2f2f566 (patch) | |
| tree | f9d9289fabed7bdc341ea8ede9a3eb7fc8ceaec5 | |
| parent | cf12a478b206cd107343827426a05aedb83816bc (diff) | |
| download | ffmpeg-adae546f2462006c6deae63ecd6402c3a2f2f566.tar.gz | |
avcodec/exr: Check uncompressed_size against max_pixels
Fixes: Timeout
Fixes: 35286/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6557139802914816
Fixes: 31253/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-4901782326214656
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/exr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index e7387ffd66..f7d59c8241 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1299,6 +1299,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata, axmax = FFMAX(0, (avctx->width - (s->xmax + 1))) * step; } + if (avctx->max_pixels && uncompressed_size > avctx->max_pixels * 16LL) + return AVERROR_INVALIDDATA; + if (data_size < uncompressed_size || s->is_tile) { /* td->tmp is use for tile reorganization */ av_fast_padded_malloc(&td->tmp, &td->tmp_size, uncompressed_size); if (!td->tmp) |