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:
9752d2e
)
asfdec: prevent the infinite loop in detect unknown_subobject
author
Alexandra Hájková
<alexandra.khirnova@gmail.com>
Thu, 2 Jul 2015 12:17:20 +0000
(14:17 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Thu, 2 Jul 2015 23:50:09 +0000
(
01:50
+0200)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/asfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/asfdec.c
b/libavformat/asfdec.c
index
f2dd489
..
9989b80
100644
(file)
--- a/
libavformat/asfdec.c
+++ b/
libavformat/asfdec.c
@@
-1591,6
+1591,8
@@
static int detect_unknown_subobject(AVFormatContext *s, int64_t offset, int64_t
int ret;
while (avio_tell(pb) <= offset + size) {
+ if (avio_tell(pb) == asf->offset)
+ break;
asf->offset = avio_tell(pb);
if ((ret = ff_get_guid(pb, &guid)) < 0)
return ret;