From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 57CBD4457D for ; Fri, 16 Sep 2022 01:16:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 744BD68BBD6; Fri, 16 Sep 2022 04:16:16 +0300 (EEST) Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB00E68BB5A for ; Fri, 16 Sep 2022 04:16:10 +0300 (EEST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1225219ee46so50030173fac.2 for ; Thu, 15 Sep 2022 18:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date; bh=cMry34VZRQYGWJqBA4UqeK+Xt2QhQu3XvedjiZOEbFE=; b=NelwuBRhr533e1v/K3j4Zl05QoD5c8TjDdEGuBoY+D/YV7Dj5VdXIXaPMPftb5h+HO PLqjklC1C8bW2T6nj0+CURHXKhWNh24ElH+NGSgRvQZy6rpNnq7tph9DAOMk4+dnlXf6 Sl2IcmcR1tu7BmgWel8caGkp1ezS5D07KL7PsOBcwS3QZn+LmIW/gv3qYjUOZda49BZ4 OlExmLwA3lW6LJGGHPhza+7Mwb99mK1InaRN2qdeImKtuntLW/BIoBl8HyRATVGQOHrl HknO1qhBOmcn2XPovy4NhmpdEAXeTZHM3ccnXA7wfW07q40pMLZ6HYvKPmJ6CXC+w89A JJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=cMry34VZRQYGWJqBA4UqeK+Xt2QhQu3XvedjiZOEbFE=; b=1jQEd9hwj0B5OgHVFHlE+5fJEukEHmFgICM4O4M/hWGqqeyySEMHzJdrBmOQ3s0SvG Jo/7qUigq4Rq0HdrlocEEzqiTY93UgeY1SOdy1pdI8F32zQiRwdqfFQK5SaLZDiSATvi YaHM9d6ERMO0OEo7tnfDMCscccfqa8Be1PRzJTWptgMCoQ6qSE9fBkWd0i7NKpj/2W3d 2NwJwqPIbFHdtGItTWcIuTlpTqXZJ6RUVYG+bg12KyAjNOFEVoBAPZvIoSltQ+EbL/X/ VvHmlgZqCgV/viSlsmQom3S2ic4sN1isnBW48ji4U8bPmSyqJdBdv0MFuoOltHpDxyHk YTkg== X-Gm-Message-State: ACgBeo2j8X4+9XHb7ivqi/kuvLnX9T02zUn/RMeUoosCCpaqDBzPhGte FhB47EDBt9aJC8gXMudIAMSJKZ2Xufs= X-Google-Smtp-Source: AA6agR4/DbyZDm2YS0u0pTflqZfoxox++ttw290kGk1+9Rcoxebey6aOVA7vXJewBhRB4sxs4LxXoA== X-Received: by 2002:a05:6870:e386:b0:127:bc46:a6be with SMTP id x6-20020a056870e38600b00127bc46a6bemr6772352oad.18.1663290968877; Thu, 15 Sep 2022 18:16:08 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id n133-20020acabd8b000000b0035028730c90sm2218546oif.1.2022.09.15.18.16.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Sep 2022 18:16:08 -0700 (PDT) Message-ID: <6d0a8d6e-48aa-3afd-78e3-1721d0f49a6d@gmail.com> Date: Thu, 15 Sep 2022 22:16:06 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/decode: Check for more invalid channel counts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/15/2022 10:10 PM, Andreas Rheinhardt wrote: > Signed-off-by: Andreas Rheinhardt > --- > Maybe use av_channel_layout_check? > > libavcodec/decode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 2961705c9d..e24005cc44 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -1595,7 +1595,7 @@ FF_DISABLE_DEPRECATION_WARNINGS > FF_ENABLE_DEPRECATION_WARNINGS > #endif > > - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 && > + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels <= 0 && > !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { > av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); > return AVERROR(EINVAL); This is a AV_CODEC_CAP_CHANNEL_CONF specific check to see if a channel count is set. A general sanity check like < 0 should be in avcodec_open2() before the ff_decode_preinit() call, next to (or as part of) the similar FF_SANE_NB_CHANNELS check, IMO. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".