MOV: fix crash when 'meta' occurs before first 'trak'

Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · fefe43ff2c
parent bc8763cda9
commit fefe43ff2c
1 changed files with 6 additions and 1 deletions
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@ -308,10 +308,15 @@ static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOVAtom atom)

 static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
 {
-    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+    AVStream *st;
    uint32_t type;
    uint32_t ctype;

+    if (c->fc->nb_streams < 1) // meta before first trak
+        return 0;
+
+    st = c->fc->streams[c->fc->nb_streams-1];
+
    get_byte(pb); /* version */
    get_be24(pb); /* flags */