[FFmpeg-cvslog] avformat/mxfdec: only return stream indexes which have a corresponding track

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Jul  4 01:23:45 2018 +0200| [e5ff2c0c06188ff47706ce62db771b6b45f86b8c] | committer: Marton Balint

avformat/mxfdec: only return stream indexes which have a corresponding track

Without this check some crafted files might crash because a packet might be
demuxed which have no corresponding mxf track.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavformat/mxfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 3a8e76e51c..996969d1ff 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -423,7 +423,7 @@ static int mxf_get_stream_index(AVFormatContext *s, KLVPacket *klv, int body_sid
             return i;
     }
     /* return 0 if only one stream, for OP Atom files with 0 as track number */
-    return s->nb_streams == 1 ? 0 : -1;
+    return s->nb_streams == 1 && s->streams[0]->priv_data ? 0 : -1;
 }
 
 static int find_body_sid_by_offset(MXFContext *mxf, int64_t offset)