From 675cfb2f86a0bd76b0784da0c7ec9a9225e37353 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 30 Apr 2016 18:06:53 +0200 Subject: [PATCH] avformat/iff: fix deadlock in parsing dsd chunks Signed-off-by: Paul B Mahol --- libavformat/iff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 4f1158161d..8b8bf01868 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -209,7 +209,7 @@ static int parse_dsd_diin(AVFormatContext *s, AVStream *st, uint64_t eof) { AVIOContext *pb = s->pb; - while (avio_tell(pb) + 12 <= eof) { + while (avio_tell(pb) + 12 <= eof && !avio_feof(pb)) { uint32_t tag = avio_rl32(pb); uint64_t size = avio_rb64(pb); uint64_t orig_pos = avio_tell(pb); @@ -243,7 +243,7 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof) int dsd_layout[6]; ID3v2ExtraMeta *id3v2_extra_meta; - while (avio_tell(pb) + 12 <= eof) { + while (avio_tell(pb) + 12 <= eof && !avio_feof(pb)) { uint32_t tag = avio_rl32(pb); uint64_t size = avio_rb64(pb); uint64_t orig_pos = avio_tell(pb);