Commit 11979c46 authored by Baptiste Coudurier's avatar Baptiste Coudurier

move atom size check before parsing function search

Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a097e559
...@@ -244,15 +244,14 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -244,15 +244,14 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
if (a.size <= 8) if (a.size <= 8)
break; break;
} }
for (i = 0; c->parse_table[i].type != 0L
&& c->parse_table[i].type != a.type; i++)
/* empty */;
a.size -= 8; a.size -= 8;
if(a.size < 0 || a.size > atom.size - total_size) if(a.size < 0 || a.size > atom.size - total_size)
break; 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 */ if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
url_fskip(pb, a.size); url_fskip(pb, a.size);
} else { } else {
......
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