From 1acf921d6f30dba14cec7f334feeeddd433e256a Mon Sep 17 00:00:00 2001 From: Shitiz Garg Date: Sat, 17 Dec 2011 19:35:59 +0530 Subject: [PATCH] adpcm: Check for channels to be a non-zero integer channels would be 0 sometimes and would cause floating point exception Fixes bugzilla #124 Signed-off-by: Justin Ruggles (cherry picked from commit e614fac2e6e185a247d722d4e92368b3c3bc4bdb) Signed-off-by: Michael Niedermayer --- libavcodec/adpcm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index cee1eed7bd..bbc7d1cd27 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -101,8 +101,9 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) max_channels = 6; break; } - if(avctx->channels > max_channels){ - return -1; + if (avctx->channels <= 0 || avctx->channels > max_channels) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); + return AVERROR(EINVAL); } switch(avctx->codec->id) {