avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 16 Aug 2018 13:36:29 +0000 (15:36 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Aug 2018 19:53:13 +0000 (21:53 +0200)
Fixes: long running loop
Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6

Found-by: Paul Ch <paulcher@icloud.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/rmdec.c

index 0216003..f26c5b4 100644 (file)
@@ -1269,6 +1269,8 @@ static int ivr_read_header(AVFormatContext *s)
                 if (avio_rb32(pb) == MKBETAG('M', 'L', 'T', 'I')) {
                     ret = rm_read_multi(s, pb, st, NULL);
                 } else {
+                    if (avio_feof(pb))
+                        return AVERROR_INVALIDDATA;
                     avio_seek(pb, -4, SEEK_CUR);
                     ret = ff_rm_read_mdpr_codecdata(s, pb, st, st->priv_data, len, NULL);
                 }