aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-08-01 20:42:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-08-06 21:04:43 +0200
commit89505d38de989bddd579ce3b841f1c011f1d7bf2 (patch)
tree375cfe3fbc80712c33f2c2ea10a37711bdde20cc
parent2bbef69b0ba938cce4f9d61bed46d3f3058e56c2 (diff)
downloadffmpeg-89505d38de989bddd579ce3b841f1c011f1d7bf2.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>
-rw-r--r--libavformat/wtvdec.c2
1 files changed, 2 insertions, 0 deletions
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);