[FFmpeg-cvslog] avformat/vpk: check samples_per_block size

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Nov 21 21:58:24 2015 +0100| [16195aad75d7350c192628d7c72c17fd44d138bd] | committer: Paul B Mahol

avformat/vpk: check samples_per_block size

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavformat/vpk.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/vpk.c b/libavformat/vpk.c
index ad60aa3..7519049 100644
--- a/libavformat/vpk.c
+++ b/libavformat/vpk.c
@@ -62,6 +62,8 @@ static int vpk_read_header(AVFormatContext *s)
     if (st->codec->channels <= 0)
         return AVERROR_INVALIDDATA;
     samples_per_block      = ((st->codec->block_align / st->codec->channels) * 28) / 16;
+    if (samples_per_block <= 0)
+        return AVERROR_INVALIDDATA;
     vpk->block_count       = (st->duration + (samples_per_block - 1)) / samples_per_block;
     vpk->last_block_size   = (st->duration % samples_per_block) * 16 * st->codec->channels / 28;
     avio_skip(s->pb, offset - avio_tell(s->pb));