From aefa2bf70a053f0fe26a2bc2342f8c8a2a43ecf0 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 31 May 2012 08:58:31 +0000 Subject: [PATCH] binkaudio: check number of channels Fixes #1380. Signed-off-by: Paul B Mahol (cherry picked from commit 824a6975ee066e944b7a20d1e220fd8974fb6174) Signed-off-by: Michael Niedermayer --- libavcodec/binkaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 9f51c7a856..0c274b9e36 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -91,9 +91,9 @@ static av_cold int decode_init(AVCodecContext *avctx) frame_len_bits = 11; } - if (avctx->channels > MAX_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); - return -1; + if (avctx->channels < 1 || avctx->channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n", avctx->channels); + return AVERROR_INVALIDDATA; } s->version_b = avctx->extradata && avctx->extradata[3] == 'b';