OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f952ae1
)
movdec: Try to recover from overreading atoms
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 15 Aug 2012 01:21:19 +0000
(
03:21
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 15 Aug 2012 01:21:19 +0000
(
03:21
+0200)
Fixes Ticket1596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
dce2c91
..
cb8307f
100644
(file)
--- 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;