From c77d409bf95954aceb762dd800d1ee2868c4b0d4 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 17 Sep 2013 19:33:48 +0300 Subject: twinvqdec: Check the ibps parameter separately MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required, since invalid parameters actually could pass the switch check below. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/twinvqdec.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/twinvqdec.c') diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index a88b6ffe83..580c1f2040 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -356,6 +356,10 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx) : AV_CH_LAYOUT_STEREO; ibps = avctx->bit_rate / (1000 * avctx->channels); + if (ibps < 8 || ibps > 48) { + av_log(avctx, AV_LOG_ERROR, "Bad bitrate per channel value %d\n", ibps); + return AVERROR_INVALIDDATA; + } switch ((isampf << 8) + ibps) { case (8 << 8) + 8: -- cgit v1.2.3