Avoid a possible overflow when reading Nikon avi files.

Suggested-by: Reimar
11 years ago · b7702fafb3
parent 9b78abae19
commit b7702fafb3
1 changed files with 1 additions and 2 deletions
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@ -350,8 +350,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
                uint16_t size    = avio_rl16(s->pb);
                const char *name = NULL;
                char buffer[64]  = { 0 };
-                if (avio_tell(s->pb) + size > tag_end)
-                    size = tag_end - avio_tell(s->pb);
+                size = FFMIN(size, tag_end - avio_tell(s->pb));
                size -= avio_read(s->pb, buffer,
                                  FFMIN(size, sizeof(buffer) - 1));
                switch (tag) {