[FFmpeg-cvslog] avformat/mvdec: check for EOF

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Nov  5 10:39:23 2017 +0100| [3f4fccf4d6d2a9a6db46bfca0e6fb648d8e3708b] | committer: Paul B Mahol

avformat/mvdec: check for EOF

Fixes #6805.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f4fccf4d6d2a9a6db46bfca0e6fb648d8e3708b
---

 libavformat/mvdec.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c
index f7aa4cbaec..fa596179ed 100644
--- 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);