Browse Source

move atom size check before parsing function search

Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Baptiste Coudurier 19 years ago
parent
commit
11979c460c
1 changed files with 4 additions and 5 deletions
  1. +4
    -5
      libavformat/mov.c

+ 4
- 5
libavformat/mov.c View File

@@ -244,15 +244,14 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
if (a.size <= 8)
break;
}
for (i = 0; c->parse_table[i].type != 0L
&& c->parse_table[i].type != a.type; i++)
/* empty */;

a.size -= 8;

if(a.size < 0 || a.size > atom.size - total_size)
break;

for (i = 0; c->parse_table[i].type != 0L
&& c->parse_table[i].type != a.type; i++)
/* empty */;

if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
url_fskip(pb, a.size);
} else {


Loading…
Cancel
Save