From fefe43ff2c180928348d445abb9696cf2581d953 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 3 Mar 2009 18:19:44 +0000 Subject: [PATCH] MOV: fix crash when 'meta' occurs before first 'trak' Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b34326c3cf..88f8003057 100644 --- 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 */