From e1f3847f860a1094a46be4c5f10db8df616c3135 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Mon, 16 Sep 2013 15:19:52 +0300 Subject: mace: Make sure that the channel count is set to a valid value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also return a proper error code. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/mace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mace.c') diff --git a/libavcodec/mace.c b/libavcodec/mace.c index 559dcee567..76118e8f2f 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -226,8 +226,8 @@ static void chomp6(ChannelData *chd, int16_t *output, uint8_t val, int tab_idx) static av_cold int mace_decode_init(AVCodecContext * avctx) { - if (avctx->channels > 2) - return -1; + if (avctx->channels > 2 || avctx->channels < 1) + return AVERROR(EINVAL); avctx->sample_fmt = AV_SAMPLE_FMT_S16P; return 0; -- cgit v1.2.3