From patchwork Mon Feb 5 02:58:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp512662pzh; Sun, 4 Feb 2024 18:58:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGg1RTv6SBf7uHw/Cl8GtFWl8vEMe60MtJu8qUvDZgjjiGwiUvSQonZ7zxtTALVKu+LVqD0 X-Received: by 2002:a17:906:3098:b0:a36:f314:c8d7 with SMTP id 24-20020a170906309800b00a36f314c8d7mr5079035ejv.77.1707101914523; Sun, 04 Feb 2024 18:58:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707101914; cv=none; d=google.com; s=arc-20160816; b=0wrvhhO3wNiJN4T5fGaRx3IB7wJaelQxQmvPjZOT+hwejTogI6eM1WLz+xdES3pKTk woK3Ybse7Zu/s+atc5XPn6ZMN1HHnT6MgnP4k+rqazfLq1FQs9awasrdpdxrvPsc5FLm rnl6cFeXHHPJWAvQejEUIWc5pstFKXS2uQood/l5Dw15Pg6jxqN+Cv7P3HM2SoE0CT8b 9Le/+IyAhzr28kQFQaLYwmD3upKEkFfSaDTkg0pCTt4bHmGdGPWi48DbogJ11Sk4yS/x SD4v6/QoSY3+EzmY47ZiVhMZVZdZjAe9W0JgqXfRMInuXGYCciKmw5++alpyVz0Jy/Xz 7a3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=Je0NlbDejvlKo98RPNRMVJuCXyx70B/PyKsbYLoSzQ0=; fh=ENYi6n5MYdw/wmlg/Bn3Epbk7xFDg+nT11BwWedvLQs=; b=Pxtpd/qTEwXS9CaVP1A5ZxNJTZXAsjdEn6LfHLnyw97314YOVrJRqj++RGoVsWysqY QxRkaAxeNIr+N5OF9oT059VP/ogq/XJ214myLr0dAQwNdrZxuMoaom0oGfy+TIzD5N16 g2Pye6nT8aVkzkuxpAQwLsxIHtOsKiBFR3ILBYtMwiBozscwM8mmIwU6/whiQ9AfJzF8 hQhSQlClUufGix3nKxT9bBxG9/WjMuZeDWlEyAZokwXHKGmdAVnMVYz+BuK/fimlM/fV wEKdeq3Uzec98cZjDE3Klb4+ZJ0t2FhQpAOiV6eEnidpYC4Q5WYmBMtg96NfBvJ2IKjU kMEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=AoK0LI36; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org X-Forwarded-Encrypted: i=0; AJvYcCVNp+Lz3kA4fdwwCj8oFFol3T/XbABU7jpUVFxVjbdCEKAdJVIQP855OBdjDX+ngwQBFD0y/d/o66DzM3W262aQHFu/OohqXUaPiDrg/q1SYDugGPxs6E8gSy7uLqB2dIWKfawlinoyhpPsPrrwMtxWvxuySs9S0te75mVEJ64xgNnsK05imz2khWEWk7MhwoXQEsLLTByg7SkMxMVJo/BnQhQ1POm1jqO33+HNIUeTKQ6qcuv7QEYQH3Ngj2IRECxUbZsXN4jiLX6iUFdLX6+PYdWyK7tqXe7HQMdSn8vkMMHxUAsWa+toxAJLKSPb6bC0vC9XySv72D7t02dXsIJ3VyHfKLEvNMyNo2K1FnC1Wa74PM2svfbAO8RS82ffCmgBHPoy8coFqVhgVfOMgexHJ2yFAqj+2SDIS2NMaUUbCSW1IwBvZlFYqj1TIwDoWpx5dZ+4EQRj8HuvQ8CtBTrtxmslTH2Gc+2eaxBKjoqDCy/NmOAt2QkzLuYdJJn8Q5WUNkYTmeZ4QbyvyNC01SYZ/a8eabtSYEVsQ5WBO+JWXHBIvigV3W4L+qKAQTiyUdEAzhEvCeZ27FS3X/lBB+K0deSOcNIwgT0fUkzQKETPHzKYI7VVfQ/P0AGVEVS1VBtuan6Yy1ghWy1xJ9vWYSmc14fN6yXgHugXT6t2BORriNJaoyRl0tiNqDqmFGyvRx2/wGUnxiDO1sXhSjaGnj+0Y+eRd6RmDUUMuWarfcMyclGL3ZrJJqScDDvmNvaq+Lgxp+v5ih975IKibMBNW9kk5cr33hfVubLKuNnpcmZ6ua4mSZayvzUwmsTxDQjSc4JFiaJ/71iRfdkP0TP8+/gVi+PW5jJbVmtBhPbLamT7KsuEEYKJJEiprTgthnwXydLKKE3+pZbr40B9odpcCyvS6hALRAtG8Qa9By+77jbMPOEcbc41AJi7A98+XhERnGou3z 5OdESy9mcgOR9yPAZImRZqbiLxqT4l2sJd4/FRlLT19W4/dhi2vy7bdPzcxS2HlM5GS4kH1cU5sSfdpxTYgFl0JpsrB86B4vI+y4x2m9cu0gRvgcQ9cM8nCL8VV0mNryPL4CMu0yEW6VeRm6fMjEkYmkT71B4wyDXauuveY1Qqnhw6U6UQI0T8L50wLhsCOBQYyOpeWOIigly/vCzzqna8E/zWx5jJj0Vz3I/X0hdE+nxaX7+3vTTkxkFIW5QNTpzMsqTrID83ozxtv5b1V7Cs81g2lzo8rZNS8nN/abSae49CvYWyjr2K2IYKvjmBVb228rafW/wML/Cekqh6Liyr96sRWY2WzS045JolVCR+f8vsNscEYJq2erKiMiTSEQ0SD4NoEoqrPtgZRehx2ek0EnnJqlN4eztKAyLzLYHpsuhvCVaCOTWk+frDd4E25aKynPoeFigqbQQFO0dy539OLuhRFhlVpYH9Wt1t/+PzA7EZ6S3D02atHXAq8lN5pg57Sp1klSVFN3JCZINP9iVtIOmBZ8eNI2hEYSdSmMQqCwUuvEZmAAkJnb64AA2LPxKRzrLqWFRottrAYb5L8cL2R8U/Wlgli/JFtvO7x+AkhaPMncHoW6T08Jg9tkU/ukPVsZE++L17 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rv7-20020a17090710c700b00a35a4aaf31fsi3374099ejb.622.2024.02.04.18.58.34; Sun, 04 Feb 2024 18:58:34 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=AoK0LI36; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F86668D150; Mon, 5 Feb 2024 04:58:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7687668CD39 for ; Mon, 5 Feb 2024 04:58:24 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id BF3451BF204 for ; Mon, 5 Feb 2024 02:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1707101903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=vnt1uGxZV0MQ6vcXXcTXHAv6dciEMfRBGe8HBuZws0A=; b=AoK0LI36w2dLpgtx8AGSbmdwp9y+OoeJaraJ9qvb//BJ9ig+Rjsa0z1VPhBuRW4XQ4r8p9 gEu2hVWfnEIYB0kcsnUL7viHTPelShZHcOrr5Q+B79T4CwBDbPecL7erh6ZTvCn7KtmBM8 57BWCVipwy1aeYGANFqmTQO3qCJ1d2bpVUv5U5ZJCBU/1p7Z0dIwmSRDQWgBHm+6k3WaXI ckjaJOrvivMd7Sg4yA3Yd8LIryMAyPi1OjlXRt3k/eH0UTXKkUQgvi0M1z28rKFvqNQOOd DhnOA4xGWJ5C+vRy2iH/IwppYBg+wD+Jq89q5RAmWuK7XmrfFrzaDBwiF4nLMQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 5 Feb 2024 03:58:22 +0100 Message-Id: <20240205025823.4259-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/ac3enc_template: add fbw_channels assert 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OPreoxT/qk7U fbw_channels must be > 0 as teh code is only run if cpl_enabled is set and that requires mode >= AC3_CHMODE_STEREO CID 718138 Uninitialized scalar variable assumes this assert to be false Signed-off-by: Michael Niedermayer --- libavcodec/ac3enc_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index ce9ef58a330..34d07cc9e5b 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -223,6 +223,8 @@ static void apply_channel_coupling(AC3EncodeContext *s) } } + av_assert1(s->fbw_channels > 0); + /* calculate final coupling coordinates, taking into account reusing of coordinates in successive blocks */ for (bnd = 0; bnd < s->num_cpl_bands; bnd++) {