avformat/mov: fix use invalid box size/type due to eof

3 years ago · 6c1b685e20
parent 4f698be741
commit 6c1b685e20
1 changed files with 3 additions and 1 deletions
--- 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 &&