diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-07-11 14:27:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:21 +0200 |
| commit | 3d628cae56170f27ac28f410e674dc554e33ea06 (patch) | |
| tree | af5422739adeee7e5e2712ab50828941c4530bd4 | |
| parent | 97d06e6d60e04b8659a5a878928b611ceecc3e6d (diff) | |
| download | ffmpeg-3d628cae56170f27ac28f410e674dc554e33ea06.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 7ad70fcfb6..6d18ceccbd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -284,6 +284,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; } |