aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-09-27 22:20:52 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-09-28 20:22:30 +0200
commit24352ca79207d3311ee544fcba908a64004763ef (patch)
tree7804d9d068b4796b716bdb47fd854acdae3a8c81
parent56ff01e6ec915963b467d3d2d488e400f67f46a3 (diff)
downloadffmpeg-24352ca79207d3311ee544fcba908a64004763ef.tar.gz
avformat/iff: Check data_size not overflowing int64
Fixes: Infinite loop Fixes: 25844/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5660803318153216 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>
-rw-r--r--libavformat/iff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 7feb121cd0..04fe8be4eb 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -449,6 +449,9 @@ static int iff_read_header(AVFormatContext *s)
data_size = iff->is_64bit ? avio_rb64(pb) : avio_rb32(pb);
orig_pos = avio_tell(pb);
+ if (data_size >= INT64_MAX)
+ return AVERROR_INVALIDDATA;
+
switch(chunk_id) {
case ID_VHDR:
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;