diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-11 14:27:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-06 14:41:41 +0200 |
commit | 4b00aaff680916c06e74e3c778efba04e30ecb4f (patch) | |
tree | 40817c1efa125a53f00bd2de4644a7d6bd73f403 | |
parent | a52577dae5ce0dade9ef772264ca6c442a8ea5db (diff) | |
download | ffmpeg-4b00aaff680916c06e74e3c778efba04e30ecb4f.tar.gz |
avformat/mov: do not ignore errors in mov_metadata_hmmt()
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@niedermayer.cc>
(cherry picked from commit c52c99a18f6e40973e52d99d4bb29e34a66c695a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 85cb1961d7..e8d0651ef8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -296,6 +296,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; } |