[FFmpeg-cvslog] avformat/vividas: Fix another infinite loop

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug 10 23:09:47 2019 +0200| [1d72b5d2d5225dde0662a1f2083a27f86a8fdb98] | committer: Michael Niedermayer

avformat/vividas: Fix another infinite loop

Not found by the fuzzer

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d72b5d2d5225dde0662a1f2083a27f86a8fdb98
---

 libavformat/vividas.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index a5f33181de..0c33ca2da8 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -546,7 +546,7 @@ static int viv_read_header(AVFormatContext *s)
             break;
 
         block_len = ffio_read_varlen(pb);
-        if (avio_feof(pb))
+        if (avio_feof(pb) || block_len <= 0)
             return AVERROR_INVALIDDATA;
 
         block_type = avio_r8(pb);