Commit 30ffbeb0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '016cac75'

* commit '016cac75':
  asfdec: prevent the infinite loop in detect unknown_subobject
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7755a574 016cac75
...@@ -1591,6 +1591,8 @@ static int detect_unknown_subobject(AVFormatContext *s, int64_t offset, int64_t ...@@ -1591,6 +1591,8 @@ static int detect_unknown_subobject(AVFormatContext *s, int64_t offset, int64_t
int ret; int ret;
while (avio_tell(pb) <= offset + size) { while (avio_tell(pb) <= offset + size) {
if (avio_tell(pb) == asf->offset)
break;
asf->offset = avio_tell(pb); asf->offset = avio_tell(pb);
if ((ret = ff_get_guid(pb, &guid)) < 0) if ((ret = ff_get_guid(pb, &guid)) < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment