diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-31 01:25:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | 35a5ce9061a48f5a8ac371602cd8236be11a00fc (patch) | |
| tree | 4c546f9ff543492e107c63aa58dd2a3a945db969 | |
| parent | 44b6cd884c152992f2c1b449a5a4a48bde6e9c08 (diff) | |
| download | ffmpeg-35a5ce9061a48f5a8ac371602cd8236be11a00fc.tar.gz | |
avformat/mov: Check for EOF in mov_read_meta()
Fixes: Timeout (195sec -> 2ms)
Fixes: 16735/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5090676403863552
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 093d1f42507e07d9acb43a8a3135e4ebe3530fe2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 624f09d3c9..f80bc47f38 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3874,7 +3874,10 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) { while (atom.size > 8) { - uint32_t tag = avio_rl32(pb); + uint32_t tag; + if (avio_feof(pb)) + return AVERROR_EOF; + tag = avio_rl32(pb); atom.size -= 4; if (tag == MKTAG('h','d','l','r')) { avio_seek(pb, -8, SEEK_CUR); |