From acd735efaf0ceba95c3f07751182af485af993d2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 2 Oct 2020 14:59:15 +0200 Subject: [PATCH] avformat/moflex: Check m->size before seeking Fixes: Infinite loop Fixes: 26016/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6195663833137152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavformat/moflex.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/moflex.c b/libavformat/moflex.c index 937f63cb63..a24e12eb8e 100644 --- a/libavformat/moflex.c +++ b/libavformat/moflex.c @@ -342,8 +342,11 @@ static int moflex_read_packet(AVFormatContext *s, AVPacket *pkt) m->in_block = 0; - if (m->flags % 2 == 0) + if (m->flags % 2 == 0) { + if (m->size <= 0) + return AVERROR_INVALIDDATA; avio_seek(pb, m->pos + m->size, SEEK_SET); + } } return AVERROR_EOF;