diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-08-01 20:42:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-17 21:34:53 +0200 |
| commit | b8e546960579d8b77ec8b43f2f459b3454736e4d (patch) | |
| tree | 3cd9c65610c20647a69cae412c390986ef8d4bcf | |
| parent | e129464be81567fc72f40dfaf6129b71298be8e1 (diff) | |
| download | ffmpeg-b8e546960579d8b77ec8b43f2f459b3454736e4d.tar.gz | |
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@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 89505d38de989bddd579ce3b841f1c011f1d7bf2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/wtvdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 7abcdd6d85..fcce54f03d 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -665,6 +665,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); |