avformat/iff: fix deadlock in parsing dsd chunks

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago · 675cfb2f86
parent d171cd076f
commit 675cfb2f86
1 changed files with 2 additions and 2 deletions
--- 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);