aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-12-04 20:11:35 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-12-06 14:25:55 +0100
commit59b4e7cbd87889c0bac710ac7f62782b637419a1 (patch)
tree89d6eeec461e776bd9a4772ffb2a6db286390fda
parentb0b90100bfda8c5cf95889e00183589de0abce60 (diff)
downloadffmpeg-59b4e7cbd87889c0bac710ac7f62782b637419a1.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>
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5c74d099da..bf9e58197b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1930,6 +1930,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);