[FFmpeg-devel] [PATCH 1/2] avformat/iff: Check data_size

Michael Niedermayer michael at niedermayer.cc
Fri Dec 11 12:00:01 EET 2020


Fixes: infinite loop
Fixes: 27834/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5694930919620608

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/iff.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/iff.c b/libavformat/iff.c
index f017684620..0f570e4b26 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -402,6 +402,9 @@ static int read_dst_frame(AVFormatContext *s, AVPacket *pkt)
             break;
         }
 
+        if (data_size >= INT64_MAX)
+            return AVERROR_INVALIDDATA;
+
         avio_skip(pb, data_size - (avio_tell(pb) - data_pos) + (data_size & 1));
     }
 
-- 
2.17.1



More information about the ffmpeg-devel mailing list