Commit fefe43ff authored by Alex Converse's avatar Alex Converse

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

Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent bc8763cd
...@@ -308,10 +308,15 @@ static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOVAtom atom) ...@@ -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) 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 type;
uint32_t ctype; 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_byte(pb); /* version */
get_be24(pb); /* flags */ get_be24(pb); /* flags */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment