From 9277050e2918e0a0df9689721a188a604d886616 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sat, 28 Sep 2013 00:34:35 +0300 Subject: vqf: Make sure sample_rate is set to a valid value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids divisions by zero later (and possibly assertions in time base scaling), since an invalid rate_flag combined with an invalid bitrate below could pass the mode combination test. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavformat/vqf.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavformat/vqf.c') diff --git a/libavformat/vqf.c b/libavformat/vqf.c index ab1042aa29..162c7530d1 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -174,6 +174,10 @@ static int vqf_read_header(AVFormatContext *s) st->codec->sample_rate = 11025; break; default: + if (rate_flag < 8 || rate_flag > 44) { + av_log(s, AV_LOG_ERROR, "Invalid rate flag %d\n", rate_flag); + return AVERROR_INVALIDDATA; + } st->codec->sample_rate = rate_flag*1000; break; } -- cgit v1.2.3