aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-08-01 20:42:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-08 21:31:50 +0200
commit88264f84c99519651a7417f4eed25ae17a6e61d1 (patch)
treeda5377d449f8ef0f6ddd3eec1483806441f2bc92
parent58477f42a2a7220bf412fbfd460c6fcc077396a5 (diff)
downloadffmpeg-88264f84c99519651a7417f4eed25ae17a6e61d1.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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 876256676c..1d5ba03bef 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -660,6 +660,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);