diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-12-04 20:11:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-07 16:26:59 +0200 |
| commit | 6711c16e6356369ba34cfd487a7fff194ab09d1c (patch) | |
| tree | 93df6c0ca9e340483aa1de2872dae0518e5c9f62 | |
| parent | a8e6ddb5df5e3188aaac0ea9f4d4fd2b0beceb59 (diff) | |
| download | ffmpeg-6711c16e6356369ba34cfd487a7fff194ab09d1c.tar.gz | |
avformat/mov: Check for EOF in mov_read_glbl()
Fixes: Infinite loop
Fixes: 41351/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5433895854669824
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 59b4e7cbd87889c0bac710ac7f62782b637419a1)
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 6c72c52fdb..987b0c0496 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1903,6 +1903,8 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) // wrap a whole fiel atom inside of a glbl atom. unsigned size = avio_rb32(pb); unsigned type = avio_rl32(pb); + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; avio_seek(pb, -8, SEEK_CUR); if (type == MKTAG('f','i','e','l') && size == atom.size) return mov_read_default(c, pb, atom); |