[FFmpeg-devel] [PATCH 3/3] avformat/mov: do not ignore errors in mov_metadata_hmmt()

Michael Niedermayer michael at niedermayer.cc
Sun Jul 11 16:26:34 EEST 2021


Fixes: Timeout
Fixes: 35637/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6311060272447488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2e061a55d1..84a240e2ca 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -286,6 +286,8 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len)
         int moment_time = avio_rb32(pb);
         avpriv_new_chapter(c->fc, i, av_make_q(1, 1000), moment_time, AV_NOPTS_VALUE, NULL);
     }
+    if (avio_feof(pb))
+        return AVERROR_INVALIDDATA;
     return 0;
 }
 
-- 
2.17.1



More information about the ffmpeg-devel mailing list