From 6c1b685e20edc6ead607b935d1d79740b9857e25 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Tue, 26 Apr 2022 16:05:16 +0800 Subject: [PATCH] avformat/mov: fix use invalid box size/type due to eof --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index dc55ea7255..87760cab95 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7689,10 +7689,12 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size < 0) atom.size = INT64_MAX; - while (total_size <= atom.size - 8 && !avio_feof(pb)) { + while (total_size <= atom.size - 8) { int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; a.size = avio_rb32(pb); a.type = avio_rl32(pb); + if (avio_feof(pb)) + break; if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || a.type == MKTAG('h','o','o','v')) && a.size >= 8 &&