From 016cac75c6061a1c03f812ddf258b8baefe70b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?=
<alexandra.khirnova@gmail.com>
Date: Thu, 2 Jul 2015 14:17:20 +0200
Subject: [PATCH] asfdec: prevent the infinite loop in detect unknown_subobject
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---
libavformat/asfdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index f2dd489b991..9989b8073c6 100644
--- 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;
--
GitLab