[FFmpeg-devel] [PATCH 1/2] avformat/rmdec: Initialize and sanity check offset in ivr_read_header()
Michael Niedermayer
michael at niedermayer.cc
Sat Nov 16 01:10:52 EET 2019
Fixes: signed integer overflow: -9223372036854775808 - 17 cannot be represented in type 'long'
Fixes: 18768/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5674385247830016
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/rmdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index e612c42e57..a951ac8b4d 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -1174,7 +1174,7 @@ static int ivr_read_header(AVFormatContext *s)
uint8_t key[256], val[256];
AVIOContext *pb = s->pb;
AVStream *st;
- int64_t pos, offset, temp;
+ int64_t pos, offset=0, temp;
pos = avio_tell(pb);
tag = avio_rl32(pb);
@@ -1191,6 +1191,8 @@ static int ivr_read_header(AVFormatContext *s)
offset = temp;
temp = avio_rb64(pb);
}
+ if (offset <= 0)
+ return AVERROR_INVALIDDATA;
avio_skip(pb, offset - avio_tell(pb));
if (avio_r8(pb) != 1)
return AVERROR_INVALIDDATA;
--
2.23.0
More information about the ffmpeg-devel
mailing list