Re: [FFmpeg-devel] [PATCH 3/3] avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()

2018-08-17 Thread Michael Niedermayer 
On Thu, Aug 16, 2018 at 03:48:24PM +0200, Paul B Mahol wrote:
> On 8/16/18, Michael Niedermayer  wrote:
> > Fixes: long running loop
> > Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6
> >
> > Found-by: Paul Ch 
> > Signed-off-by: Michael Niedermayer 
> > ---
> >  libavformat/rmdec.c | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> LGTM

will apply

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 3/3] avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()

2018-08-16 Thread Paul B Mahol 
On 8/16/18, Michael Niedermayer  wrote:
> Fixes: long running loop
> Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6
>
> Found-by: Paul Ch 
> Signed-off-by: Michael Niedermayer 
> ---
>  libavformat/rmdec.c | 2 ++
>  1 file changed, 2 insertions(+)

LGTM
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 3/3] avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()

2018-08-16 Thread Michael Niedermayer 
Fixes: long running loop
Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6

Found-by: Paul Ch 
Signed-off-by: Michael Niedermayer 
---
 libavformat/rmdec.c | 2 ++
 1 file changed, 2 insertions(+)

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);
 }
-- 
2.18.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel