]> git.sesse.net Git - ffmpeg/commitdiff
avformat/wtvdec: Check dir_length
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 19 Oct 2020 15:59:53 +0000 (17:59 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 21 Oct 2020 15:21:41 +0000 (17:21 +0200)
Fixes: Infinite loop
Fixes: 26445/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-5125558331244544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/wtvdec.c

index 83f510b92f11e940409a3e15d568fa55dea809e6..77908e63921e88a48ac9743f0d67590f04fab237 100644 (file)
@@ -273,6 +273,11 @@ static AVIOContext * wtvfile_open2(AVFormatContext *s, const uint8_t *buf, int b
                    "bad filename length, remaining directory entries ignored\n");
             break;
         }
+        if (dir_length == 0) {
+            av_log(s, AV_LOG_ERROR,
+                   "bad dir length, remaining directory entries ignored\n");
+            break;
+        }
         if (48 + (int64_t)name_size > buf_end - buf) {
             av_log(s, AV_LOG_ERROR, "filename exceeds buffer size; remaining directory entries ignored\n");
             break;