From 6093960ae35c8d69c559b5604f683c2ea3f279ca Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 15 Aug 2012 03:21:19 +0200 Subject: movdec: Try to recover from overreading atoms Fixes Ticket1596 Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index dce2c91524..cb8307fe8f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2666,6 +2666,10 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) left = a.size - avio_tell(pb) + start_pos; if (left > 0) /* skip garbage at atom end */ avio_skip(pb, left); + else if(left < 0) { + av_log(c->fc, AV_LOG_DEBUG, "undoing overread of %d in '%.4s'\n", -left, (char*)&a.type); + avio_seek(pb, left, SEEK_CUR); + } } total_size += a.size; -- cgit v1.2.3