aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-01-12 21:54:31 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-11 21:23:48 +0200
commitec6eb51ae8fdcd4823500b47160b5e1ae90c4917 (patch)
treead6b6adfb89ec368cde369a81ba1d6b9f6459c03
parent35d9e182b9b711631c91d84bfe20ec23862a8147 (diff)
downloadffmpeg-ec6eb51ae8fdcd4823500b47160b5e1ae90c4917.tar.gz
avformat/flvdec: Check for EOF in amf_skip_tag()
Fixes: Timeout Fixes: 29070/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-5650106766458880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9725d07a1770fbfafe5f7b3f7d95a2a513308538) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/flvdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index c0a97258a6..828b572f7e 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -806,6 +806,9 @@ static int amf_skip_tag(AVIOContext *pb, AMFDataType type, int depth)
if (depth > MAX_DEPTH)
return AVERROR_PATCHWELCOME;
+ if (avio_feof(pb))
+ return AVERROR_EOF;
+
switch (type) {
case AMF_DATA_TYPE_NUMBER:
avio_skip(pb, 8);