[FFmpeg-cvslog] mlvdec: check that index_entries exist

[Andreas Cadhalpun]

ffmpeg | branch: release/2.8 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Sat Dec 19 23:47:54 2015 +0100| [63ecbb82fc1d6db23cda10b313c0435866d16384] | committer: Michael Niedermayer

mlvdec: check that index_entries exist

This fixes NULL pointer dereferencing.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/mlvdec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c
index 48a429e..4b3bdc1 100644
--- a/libavformat/mlvdec.c
+++ b/libavformat/mlvdec.c
@@ -365,6 +365,11 @@ static int read_header(AVFormatContext *avctx)
     if (ast)
         ast->duration = ast->nb_index_entries;
 
+    if ((vst && !vst->nb_index_entries) || (ast && !ast->nb_index_entries)) {
+        av_log(avctx, AV_LOG_ERROR, "no index entries found\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     if (vst && ast)
         avio_seek(pb, FFMIN(vst->index_entries[0].pos, ast->index_entries[0].pos), SEEK_SET);
     else if (vst)