From 28aafef295014edf6f231de51a371ddbe0acb424 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 20 Sep 2019 10:25:05 +0200 Subject: [PATCH] avcodec/utils: Check channels fully earlier Signed-off-by: Michael Niedermayer (cherry picked from commit 83f2555e5ff571cbf5c226a920602e91228039ab) Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 729c10a8ed..c48ada599a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -678,8 +678,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (av_codec_is_decoder(codec)) av_freep(&avctx->subtitle_header); - if (avctx->channels > FF_SANE_NB_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "Too many channels: %d\n", avctx->channels); + if (avctx->channels > FF_SANE_NB_CHANNELS || avctx->channels < 0) { + av_log(avctx, AV_LOG_ERROR, "Too many or invalid channels: %d\n", avctx->channels); ret = AVERROR(EINVAL); goto free_and_end; }