Commit 675cfb2f authored by Paul B Mahol's avatar Paul B Mahol

avformat/iff: fix deadlock in parsing dsd chunks

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent d171cd07
...@@ -209,7 +209,7 @@ static int parse_dsd_diin(AVFormatContext *s, AVStream *st, uint64_t eof) ...@@ -209,7 +209,7 @@ static int parse_dsd_diin(AVFormatContext *s, AVStream *st, uint64_t eof)
{ {
AVIOContext *pb = s->pb; 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); uint32_t tag = avio_rl32(pb);
uint64_t size = avio_rb64(pb); uint64_t size = avio_rb64(pb);
uint64_t orig_pos = avio_tell(pb); uint64_t orig_pos = avio_tell(pb);
...@@ -243,7 +243,7 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof) ...@@ -243,7 +243,7 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof)
int dsd_layout[6]; int dsd_layout[6];
ID3v2ExtraMeta *id3v2_extra_meta; 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); uint32_t tag = avio_rl32(pb);
uint64_t size = avio_rb64(pb); uint64_t size = avio_rb64(pb);
uint64_t orig_pos = avio_tell(pb); uint64_t orig_pos = avio_tell(pb);
......
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