aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-07-21 23:27:59 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-07-22 17:31:16 +0200
commit6fbd4d22859bbf7b8b1d27a722efd8947688b5ce (patch)
tree4f165bcb531593a199392812e02c956c877d811a
parentfa511b03d3a7d02e4c6bd1e17d12eac2d71fd03c (diff)
downloadffmpeg-6fbd4d22859bbf7b8b1d27a722efd8947688b5ce.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index bf69b083b3..2d40626ccc 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -965,6 +965,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);