Merge commit '76481f57b528168b00035aee76f7e0878669011f'

[ffmpeg] / libavformat / mvdec.c

diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index f7aa4cbaecf863ac11a76ec677a0bd24d53253ca..fa596179ed97ab8fd25d07bacaee0ad4a98153b4 100644 (file)
--- a/libavformat/mvdec.c
+++ b/libavformat/mvdec.c
@@ -227,7 +227,9 @@ static int read_table(AVFormatContext *avctx, AVStream *st,
                        int (*parse)(AVFormatContext *avctx, AVStream *st,
                                     const char *name, int size))
 {
-    int count, i;
+    unsigned count;
+    int i;
+
     AVIOContext *pb = avctx->pb;
     avio_skip(pb, 4);
     count = avio_rb32(pb);
@@ -235,6 +237,10 @@ static int read_table(AVFormatContext *avctx, AVStream *st,
     for (i = 0; i < count; i++) {
         char name[17];
         int size;
+
+        if (avio_feof(pb))
+            return AVERROR_EOF;
+
         avio_read(pb, name, 16);
         name[sizeof(name) - 1] = 0;
         size = avio_rb32(pb);