Module: libav Branch: master Commit: 5b4eb243bce10a3e8345401a353749e0414c54ca
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Mon Jul 15 15:59:50 2013 +0300 mov: Seek back if overreading an individual atom Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: [email protected] Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/mov.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2d87a08..b33b30d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2592,6 +2592,12 @@ 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_WARNING, + "overread end of atom '%.4s' by %"PRId64" bytes\n", + (char*)&a.type, -left); + avio_seek(pb, left, SEEK_CUR); + } } total_size += a.size; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
