]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/tiff: Check stride for dng
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 14 Jun 2020 21:45:46 +0000 (23:45 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 15 Jun 2020 17:44:23 +0000 (19:44 +0200)
Fixes: assertion failure
Fixes: 23422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5746026064642048
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/tiff.c

index 010943c38c94ba4e6acfe19214cbc99b161342cd..dc24d055eca591945fd51591925213ea454a7767 100644 (file)
@@ -679,6 +679,9 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
         return 0;
     }
 
+    if (is_dng && stride == 0)
+        return AVERROR_INVALIDDATA;
+
     for (line = 0; line < lines; line++) {
         if (src - ssrc > size) {
             av_log(s->avctx, AV_LOG_ERROR, "Source data overread\n");