ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sat Apr 30 18:06:53 2016 +0200| [675cfb2f86a0bd76b0784da0c7ec9a9225e37353] | committer: Paul B Mahol
avformat/iff: fix deadlock in parsing dsd chunks Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=675cfb2f86a0bd76b0784da0c7ec9a9225e37353 --- libavformat/iff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 4f11581..8b8bf01 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
