[FFmpeg-cvslog] avformat/wtvdec: Check for EOF before seeking back in parse_media_type()
Michael Niedermayer
git at videolan.org
Fri Aug 6 22:05:32 EEST 2021
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Aug 1 20:42:53 2021 +0200| [89505d38de989bddd579ce3b841f1c011f1d7bf2] | committer: Michael Niedermayer
avformat/wtvdec: Check for EOF before seeking back in parse_media_type()
Fixes: Infinite loop
Fixes: 36311/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-4889181296918528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89505d38de989bddd579ce3b841f1c011f1d7bf2
---
libavformat/wtvdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index a549681322..191da2718b 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -652,6 +652,8 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
avio_skip(pb, size - 32);
ff_get_guid(pb, &actual_subtype);
ff_get_guid(pb, &actual_formattype);
+ if (avio_feof(pb))
+ return NULL;
avio_seek(pb, -size, SEEK_CUR);
st = parse_media_type(s, st, sid, mediatype, actual_subtype, actual_formattype, size - 32);
More information about the ffmpeg-cvslog
mailing list