diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2022-07-21 23:27:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-25 13:51:49 +0200 |
commit | cd76f3ed591beba5c64b57fa7fcc596acc678c4c (patch) | |
tree | ec4c897d910f29607d57b9d3082c80a5787df9d1 | |
parent | ff6d408ac0370058a6d0e039881eef02b0b122d0 (diff) | |
download | ffmpeg-cd76f3ed591beba5c64b57fa7fcc596acc678c4c.tar.gz |
avcodec/tiff: Check tile_length and tile_width
Fixes: Division by 0
Fixes: 49235/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5495613847896064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 76112c2b4167bb3c40503b3334c8b38fd707a8d5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/tiff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 19fa4ac350..4be9ad1735 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -977,6 +977,9 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame, int pos_x = 0, pos_y = 0; int ret; + if (s->tile_width <= 0 || s->tile_length <= 0) + return AVERROR_INVALIDDATA; + has_width_leftover = (s->width % s->tile_width != 0); has_height_leftover = (s->height % s->tile_length != 0); |