diff options
| author | Martin Storsjö <martin@martin.st> | 2013-07-15 15:59:50 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-28 14:16:37 +0100 |
| commit | 86d0bf0e96bf917e283d24239ce0eed08351da86 (patch) | |
| tree | e237388e2a9f71a64149f98be5f7113957bfd921 /libavformat/mov.c | |
| parent | be8b796f559cece8a0312749e470d47b1653fa23 (diff) | |
| download | ffmpeg-86d0bf0e96bf917e283d24239ce0eed08351da86.tar.gz | |
mov: Seek back if overreading an individual atom
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 5b4eb243bce10a3e8345401a353749e0414c54ca)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavformat/mov.c
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 0e5d473a8b..9cac5069c0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -357,6 +357,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; |