diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-16 15:36:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-07 21:34:00 +0200 |
| commit | 3f095c5b56ba11b6fa684c7fb3343bd0f14f19e2 (patch) | |
| tree | 5b2201f592cf84720cec77975b9bb971502a9bca | |
| parent | b95c209a6108700a32cb4cdca516f1a36b56134a (diff) | |
| download | ffmpeg-3f095c5b56ba11b6fa684c7fb3343bd0f14f19e2.tar.gz | |
avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()
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>
(cherry picked from commit c2eec1762d372663c35aaf3d6ee419bafb185057)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 0216003e88..f26c5b4d90 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -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); } |