Commit 7d90bc9f authored by Michael Niedermayer's avatar Michael Niedermayer

movdec: Read extended 64bit size before the debug av_log() and only when there

was enough space to read the 32bit size.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent fef2da6a
......@@ -315,13 +315,13 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
a.size = avio_rb32(pb);
a.type = avio_rl32(pb);
total_size += 8;
if (a.size == 1) { /* 64 bit extended size */
a.size = avio_rb64(pb) - 8;
total_size += 8;
}
}
av_dlog(c->fc, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n",
a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size);
if (a.size == 1) { /* 64 bit extended size */
a.size = avio_rb64(pb) - 8;
total_size += 8;
}
if (a.size == 0) {
a.size = atom.size - total_size + 8;
if (a.size <= 8)
......
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