From 68ff9981283a56c731f00c2ee7901103665092fc Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sat, 28 Sep 2013 23:19:10 +0300 Subject: vqf: Make sure the bitrate is in the valid range MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even if the sample rate is valid, an invalid bitrate could pass the mode combination test below. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavformat/vqf.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavformat/vqf.c') diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 162c7530d1..a43829b855 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -182,6 +182,13 @@ static int vqf_read_header(AVFormatContext *s) break; } + if (read_bitrate / st->codec->channels < 8 || + read_bitrate / st->codec->channels > 48) { + av_log(s, AV_LOG_ERROR, "Invalid bitrate per channel %d\n", + read_bitrate / st->codec->channels); + return AVERROR_INVALIDDATA; + } + switch (((st->codec->sample_rate/1000) << 8) + read_bitrate/st->codec->channels) { case (11<<8) + 8 : -- cgit v1.2.3