From 11979c460c2891fe2dabd40501dc7ad53fe71d46 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 29 Mar 2007 10:45:34 +0000 Subject: move atom size check before parsing function search Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libavformat/mov.c') diff --git a/libavformat/mov.c b/libavformat/mov.c index cbd0f760ee..e9b577576b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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 { -- cgit v1.2.3