From patchwork Fri May 24 08:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49200 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1572767vqf; Fri, 24 May 2024 01:37:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFmynTsi8vo0pmgLbq9QvfW6DbXIqeQdNlpMuAfy8woDMl6ZxOGPSF+yeEqI1mQzHobF5xDKRyR8Q1mlw6QqtncqZXWKZ3x4n7ng== X-Google-Smtp-Source: AGHT+IFr2mBKL61wmpiE1CZTzs0p4bR9P5+jfncphf9eMy9NkvCFa++z302G7JulF7ZQ9JyjHKmK X-Received: by 2002:a17:906:7043:b0:a59:ba18:2fb9 with SMTP id a640c23a62f3a-a6264179fa9mr97870966b.12.1716539826985; Fri, 24 May 2024 01:37:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626cc6268asi56600366b.488.2024.05.24.01.37.06; Fri, 24 May 2024 01:37:06 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=O5kuMsuf; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 974AA68D521; Fri, 24 May 2024 11:37:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2048.outbound.protection.outlook.com [40.92.64.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E68068D4A6 for ; Fri, 24 May 2024 11:36:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmhMUrKklfvFOHK1aUOsoKkPjVM12bGv5IpVb8dG/9OSJ0zbuMmM97GTz2eL5ndxAdl9i0yLwdGuhdP2LgT5Iyd4vmvWiFkjEFAq2RVjWrRIZioj6Q5NV16MvzAJer/23CAoV6l4qsfvPV05dQtA5X2kYLdyqWoAkh0CfjNTSHhqK4+oOSpPIAZqGw4wEygvpicG0f08vfaqR79O6sIBhjgOL1gwctO5XCIMo2jCzWUgWscesUepR4GjRPdiHXgxhC6xqiZRJsepIpwWIsSAgohklb/jsJ/takTSlwPPNeNlpPIYf2Y6EW2P93ZJGH2zm/3Y1Jkyw5ilAuGibuh2pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1pQXnYwt5mbFPbvcOrec++89hcW6dGR3IuCCmHHg430=; b=P2CyeZggZW6k4bikMdVnkYPRM0clEfAToxI5JTU6Lj3+BUkiPFXOOhzkqGD9KI+GJw0AkA7HbyxIAuGwHaAS8nIzJ1PXpTYDaRWFPtMst5s0jqPizqYOfopXw/DtUAe8jiskNPNpQnPSTuheoZBffcEIl+7IsstlujM8UFh0yh6D7vyE29YK3tO9Q04sQkuUW/fH+FjcWw+OWTESX2RPtRrzJXwY1ImDXV2bHE5lEDZMXNse3F9I7HKhEL2oBYHHjIQPoWWghLSz3oCljiOrFW80DbhiJXPwv71tM4ebFmlpJNlcgYlb+B7i0KZ0v4vxZb0jTX7diKJI9QYtSiAGOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1pQXnYwt5mbFPbvcOrec++89hcW6dGR3IuCCmHHg430=; b=O5kuMsufQQYzzN/mLp10fAzAkVu8xdL7b/2akWd/+nfF5rljf7buW5wA5FSDChuEg/CcG705FvfJjQc4L/qM/UGgWFmBT0K7sM29ePE+5W8ediBe18bZI6PZsKLAF3r7++KPBqbvFdLuTJkmidWBWeV6C/f6uXPnV9FiFnS320FJNZOaZ46ualzHo6K3yKB8gRm4xYlaQ88kvVEoCU11tLU2Rr35HtERF9yyR+26hu4Ck+PFXUaMOcZXU+nhdcES0MZ3CKd1GhsuRwsgSz6MFvxukd+Ox68RleLA2p5Pf/pN8/kUv8KnvnjTsH8g5NQFy6E1Hx/XajoYRR7JTDwWmQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0359.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 08:04:48 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 08:04:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 10:04:18 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Sx7g7/hZx6nTfsrfjM97rWcZ9TwZwGUDaIdquI2OfPA=] X-ClientProxiedBy: ZR0P278CA0178.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240524080421.493471-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0359:EE_ X-MS-Office365-Filtering-Correlation-Id: fc7d4bbb-aabb-4c15-0958-08dc7bc82e32 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: fr469R6Fg+avVfdmGoVp7Zlp10h5YfRU7UOc9R662fBMjXMoGiMj/RFW2uNfbMkL+N0c9/g4odF1mPXT44vEUjLkENEEfn8tS61ki/9q5K5XA3f3AXcKz526L8Y3QKHzbnd8IJYMOEoqPSbx2RegMHpOBmT76AU7x3WJYLpy/lJOxD0rK7hat5/vSbxMU8yXgNKzLmEga1MtM7VaTuHEDNw9MDWApNbneHsuu48j2mlmdnY0X2X26BKSITQMeyViPHdyoctdVpJB+gDAJOtexReTPyMsdGIhYCPK+jacRl8Hi9EDtSq3nOLJ/pIxHkySVsRoEKoraPuW7dgI35PPby6E7yOs96h8sW7iLr2oGqRenzECd2iugwnL74tr79l1xj5NBPyr3uD/TeZNvX5pQJJDm5YM/mePVAeu1L2mjwOC/qgyzwHPJ8qp8xjZr/EsCAcpjjFjV7Qbj4tWDF9HDE7qGjr4DnMqEEAuiRHJpZoHciGtoha6rTwLsSwFw6QRLqf0c52FDJ02Q2W0qgMjGhLUCdn8+GHOo6YcmTNpH7KBji57KTRbf0EjpcC4ULcHsO4FgNOVMgalYjLQigShCazFCUk+1tgVOQpjnvZRWpvBS2hXOocmvxIRs7jKWmQY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yMpAtOt1By5QbRqkKlmV2RDwjw6OdYZgdMg/Ckz6HUHlVMC/rqSaC2E0o3Eiul5b7ULMkcYL2JN7EZtPyoBTP5xiLOOYr3qfYLoj3nzxr8IWX1PCau/z80FX0+vtL2H/PFhX0rvfL6gGqPOl2VxANr1gWftMJlXsLjNMI1umH1Uu/10VCLKbZwiUAGwtiGexo3N6wFLgyVSl3hVeqpYZDIO/jD8wD6J0qPeNpuUz19NcKzTmoyi1rXBNAUan9I+swrgxPKoEzuzKqSG+0N6TRnv6+VvoCpre3nqE9Zp7lxg2tkVYlZybcz9URYdDtVK0toAIWeQixQxJMxKEjKpVNzCgTyZN2KH7YHShRsPLbKKQwroE50Dc07fTEdvA89Cu+fwrJ11I3Ix1IYWTlPAunjtPA+HcFPQNFMyb/0OVxbdXoss4XmUfYHQ3Ug7eXXqAEP65qJA/keAwTECsrbdARt5qFxtWVHJnLHcBFHZX3lfZ/+8sozCAMpWkB3yEwUYlwcKwD5hg0zQ5fxoeo+sAgGE/u1b/krlFYYZ2cMaKt5PpbIdtOoI67z46NNduN+ggVQ8tDQws6sUghsCyCiev3X4aPuD6cWSZE8evUfU1fxbypPGHe2KXpJY7nNhqa+os4uYn3/zj4H5qWlALi4S65G4gWT//+xHRvaQFSaveQhaxzuxi2QCw/LUBAtMFDd+0CLEzFJaz9q5UeQ8oXu8lgVWy/335lFoI7K3HxE6iK8d0jmixlgkdTKD2aV2GgadvzB+ZIfNjIng4hgmAbv4JP/dZGxWtNhJ4lZIsdqwqEcALv9vSID3OQMLcQiXjSWMsgYXJBG6QMJQxeqR8nWQwUM/5AmdqXSPkiyACHmJMQN/0/PvYm/+fDPCPLvBura1ShCn151qQeOo29E4AE4vb3x7cIl06RZSYvjAojtRRsou3mmSi/qlhcsUniUCL0eF6BbOpvwJ/Pga9O5zrEuqNY4L2j3Z/0dL2TjUv/vvm0JshGPH5nbavdUGoWOzb8aCvQFNzMpNrpv+lquvgC1hMnRVFChgGzNW1lCGJDNQlmzWRURbSpJSZgOVx8LN53eooFZyLMwCw+cRJNhJXoV2y11qIS9cAD1Z/yBqP6mtuANdhPx4aw8I4STG6ilWwwq0Mnf4A3lvmIFYuFnrQdwb4qTpeba/bPYsRqXZZcs+Z0pZwfNU7moghayEMp+lFGUS8+7fLBgARisqQYT36+T02auPDmiM+pbPLudxgXaI6HEmM5FnzabClEthdN3Jypi6IhykANy1jcUfsG+x0Ym5ggA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc7d4bbb-aabb-4c15-0958-08dc7bc82e32 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 08:04:48.1002 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0359 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/vf_signalstats: Use 64bit for processing histogram 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nDNHRkXNGjbk The result might not fit into 32bit if an image has gigantic dimensions and one of the planes has a dominant value (particularly so if said value is big). Fixes Coverity issues #1598399, #1598401, #1598402, #1598403, #1598404. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signalstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 50c9df4298..78a23bb705 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -721,10 +721,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (histv[fil]) maxv = fil; if (histsat[fil]) maxsat = fil; - toty += histy[fil] * fil; - totu += histu[fil] * fil; - totv += histv[fil] * fil; - totsat += histsat[fil] * fil; + toty += (uint64_t)histy[fil] * fil; + totu += (uint64_t)histu[fil] * fil; + totv += (uint64_t)histv[fil] * fil; + totsat += (uint64_t)histsat[fil] * fil; accy += histy[fil]; accu += histu[fil]; @@ -745,7 +745,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) maxhue = histhue[0]; medhue = -1; for (fil = 0; fil < 360; fil++) { - tothue += histhue[fil] * fil; + tothue += (uint64_t)histhue[fil] * fil; acchue += histhue[fil]; if (medhue == -1 && acchue > s->cfs / 2) From patchwork Fri May 24 08:05:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1601141vqf; Fri, 24 May 2024 02:38:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbYMnji3pa0NkzvwQ0JWl64BmungBlAICCVdClEn2lLmRTlZcyBnDmFzGGhDjHPcAksMNFIL2kd1TJidvWTP1gMCXCmV+wGMPR2A== X-Google-Smtp-Source: AGHT+IEqeksMm1AK8EjVLNQRGOG9AFQ2rWdivv1LTm6lU8isfUazDA1fm64qIbX5VOBY4zPvxj/X X-Received: by 2002:a17:906:55d3:b0:a5a:54ca:5bf9 with SMTP id a640c23a62f3a-a6265116b37mr107927366b.64.1716543519697; Fri, 24 May 2024 02:38:39 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626cd9516asi60449266b.865.2024.05.24.02.38.39; Fri, 24 May 2024 02:38:39 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=VZLBEowb; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 194AD68D541; Fri, 24 May 2024 12:38:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2064.outbound.protection.outlook.com [40.92.50.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AD9468D1C4 for ; Fri, 24 May 2024 12:38:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Epe5w+abD6l2n88kNzMqKb3ZbMJ8wbO/urUxoAFPSn8uuOcT+TYP/q/zDshyhpucLpdM6FYcJeCLo1Pw5p24DtTMzg47fFDre9usSIvFeJ/iWzUChztgByJsbgsCxyf/7w70tfrxVegDZQyXoV7j3paS4Y5/hW/SMwGp2ybS4PG9akCicLE82a6D9LEF6cQGL0jp7/wdce4YqHRE1AUzxHGPNBlbDnlvOcvxxyZA/w87Ibl7lEjqG//aTUghjX/ebQINRRXQf2kndKaKEqKiEC49XfAO2X+K6+ZBpShpsYYUoXXuZ/Whd1sD2jOJQGJEzR/Zt7SdlHCIDxordB1ugw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Hjnup3ALiGxymVnPIwEWSh/sHK0/7T0oXCLWsjhfkc=; b=T7lumH87qhsMjv1nzQapM/p80W9plakkqCpl1NLzc+NUBhaw1il/6EClLDWcz6XVw7okfiJKTy7pktRtQylaK/E4CfsZFcOM+2Nf6Zo836FjvmTJH3HPw5toIr/TlJQx5EDI2k90aNk2IOIUqONmXFNnZUaHrvFYpRMhSzOIYKRV49v7MDMvNvvBKqXh0atgUXVhwepmPQ/ISvbbmYvD66z0Z/ifQqYtRxNW8M8ftNNm3vrsR9N9Iv2j0pd3wUVv1j3GUgR1oQ4zmHJ60i/XHGCB8KUKLE/cPysDFFKaXIQG6RohE1bvuxEQB7Jj7hITvVg9kuIQcgDuV9vzEe7Eig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Hjnup3ALiGxymVnPIwEWSh/sHK0/7T0oXCLWsjhfkc=; b=VZLBEowb2hQaYwvK3zgXPN6z4UTzGUP37tj3f9MYZKgHl1rRNZcVWbBSd/QkJ9SNFF1RSVhwv2n9qHJ/q3wLXgOzDBAw9q8CeJm4ZRikU3fv7haOp8RBA7wvzOgzLbqJoIS386qme/lzsBHIPF05IuHLDhdkbqigNvNu4xJbMhuT/g+FHV9ue2/CIjitu2pZ1MBrg7qDZzsPhw1gDkJDKIpNpnEa8fIPx6Fj7wSbqWZpPamusCk6x3yQIhY8qtmZbb3uZqU2NFoNw5kPJYPsePklFl09lOsBmpVUsHJ77zYhqgqqZMIFQ/fcbcAVvKDGbJZ/DM1cl0wsFKhoYm1glw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0359.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 08:05:29 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 08:05:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 10:05:18 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ECIskdQBRRua/Bwg9+aSUQmSha8ns6DL1Hf6gYbySjE=] X-ClientProxiedBy: ZR0P278CA0087.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240524080520.493595-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0359:EE_ X-MS-Office365-Filtering-Correlation-Id: dc059d2a-2a5f-40f9-f36e-08dc7bc845f1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: jtOpLdBNQn1IyVwQGN2T8NcvGCsVyTHkpRU2lTqh8hXofu1FlTNetTV/VhVQ0uv7NgQ3JhXBrbRwi815SKSVHYbe7YWnjfSeZI30BgKNiRjPvlRQ222EzVg6541t9JFsI1gm7esoNm89w7UDFU8c1U4tj28k5M8OBD1Jcb6DKc2kAaafeFRpFjnv7FzwKbKu+e3r5tQAyRrawazqs+QDY1d7qCbCFWgc0wTVEhfVFRdCBUI3mAN3WuyKbqaHR0FfDrQsB7VF2BAtonZ0PJbCSYFdRYdC829iEYzLhn/AZSvSjR7skjiCjNozaqEnWJoR9Gvd4DGsVsHFbH/203zT+ZtGanbu2FYYKlGwKdNT2r3u/QZ9JTqN4rKWpFJLXHAuXA1wlJFTSZ1EXGdb5ZMZZ3LOPsuVcVdNyAmWZj3xZE7z/yq4Knf2Z1Gf3GUdtV9T2wkvPHKKtwGwLHkxk1UN5xfBUuHeAsuhkl9+mpedsYSJncA0V+fd06T53ub/XLaAcufPrU6i/Ie8T3moSTKMfP1CWnA91lU6iHlq/UKVBZkcyckfD/BV4RG4KN7E+eGX50hukZ6OBoAY26p7YdSwI1Prb6niD+O/vWaMTQ3vw2C0IVt56SzT7XqX7kWa5yrI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BRdKbSDMmVH8mpT1f4X9Qxc6PD37TVQUMWvLczzOifQ+4coYlasa4SspbBbx7cVB5rbhRtbM9aNmwM+xeoEzPwGXxvV5ZqabscprW4+1X5aviBcqTzK1vwdxyU4T7qydsu1fMMzsbbWf01jMyXYE6WvOttQHwqM5P++lGPkFLKSiud2EVPjU4omYPrCFC78yyJvqIijxbz5TtISGtBUehDdQPSmvoOZIax2Qu860EspTSHfpVsPIJar/OGudCN9waxWkBSE2ytECSL/3hy3TK+WmpNIpP82OVTnIPp4+ESFkp96gUBFQVO3+I73NJmiI2YTU12Drs1o/KpfGHNiH48uORpM0ENMnhHQeg7XvT/7ufqE7bVJfDX+bIJdaXt+5PJAa9yqlntIlxU22r44CzwtJc+fBRV9lVUZCsQmv2sJdVKQe5npGAxS+OAKsWlHK9WIlNbiUoxkPqw04XEjJFKXVB4GjsiN6/Py9lU8oPwW21h0jPrO5zU9uBkS40UiTPQGx9SKXdpsfYAiwzxtHB9UmDQfwMtxPQFu6o/RnK+auZZ35zFqaaM6xNuDL5ElMuQtnMRnIvD0c4LlLDC9Ov4k0LRqvxMF5MjjDyNFJPYFUGISYXBSaWtlNbnEWlC2pNZB1FaHGBPsGF02Q62LcPxhvHXikuNxL3kasFAWENi+6eKpT2BUku0xEKBqKxMgFKijAR5DyASE0Ny8ta/+WtipeoKfqdzyVN7PxxVN5Jw0focK7s5a0+LjtgnZ6by1KQdmLfET3ws2Bcfk7y6MDquymz/ECl5lptREMjAvLutpMyf/eUHbP//vxXFHMb0P7LN4T/d7wxmHM4KQpWMAzhmpWQ7AReuN6BYyhnSrQ8yipRluuusKnd/0/WibMhLTPQvUFKL35WMDGxpgINflkNiiMtMKci0gdwoyAGuTuBvSKE/3JMKOF74MxXDUDsHa7GEiYwTAKbyNQkBE4P4nN009QK5EiI9Rlpm+Q7FQF6snvMgMGnhNLFVTGZ/5e/RdIaqjfSn8Dj57S5j3JgOV9hY4IS7tjYQn3KmExn412mu8UBJVEJOfktKI9eVIvtis0oB6fbF+H6wO1gV2XEr8HRDIMbD2RMHRCwdeRpP5+kNcEjNhY79luDNIEty13QpKzxlNXnYefk0V05HphGNKeBj8VLxR7gW5JxzU8ro6Eo22iCW3gtwuZw59K2/cdPX7S6L75sTGFtVDnYiR+3UTMOoem42gQArUCuWMx9P64O1Azi/JyTwN2Rt5gHz8avP7Qs1GdTshu86DSuVjpQAxfQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc059d2a-2a5f-40f9-f36e-08dc7bc845f1 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 08:05:27.9905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0359 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/matroskadec: Add assert to silence Coverity false positive 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KMQeu/6//fxD Helps with Coverity issue #1452453. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2f07e11d87..13959f8b3d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1315,6 +1315,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska, matroska->num_levels--; return LEVEL_ENDED; } + // We have not encountered a known element; syntax is a sentinel. + av_assert1(syntax->type == EBML_NONE); }; } From patchwork Fri May 24 08:05:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1558865vqf; Fri, 24 May 2024 01:06:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVob4zeRChc6OASXAdagrSnGDb0tadR4/22vGfAGWGu1DPlzNbCagp/K/7b+p+KPCBpAZ9GZjXuwrdPkCEho3GjrO2k1BEghUHNzg== X-Google-Smtp-Source: AGHT+IFobGqz3sqEo0V0mKkP6nh5SHXdv8eeMQoaLH9URfbQPLtWTyAPeD1ajXwirZ3urLUSs8Cp X-Received: by 2002:a50:d7da:0:b0:578:3356:a0ef with SMTP id 4fb4d7f45d1cf-57851925172mr740864a12.10.1716538008531; Fri, 24 May 2024 01:06:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-578524b604bsi576404a12.563.2024.05.24.01.06.47; Fri, 24 May 2024 01:06:48 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=Voj9QLKM; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8FD868D521; Fri, 24 May 2024 11:06:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2102.outbound.protection.outlook.com [40.92.73.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D2BD68D321 for ; Fri, 24 May 2024 11:06:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JzHJnqG7VClZClf/4ZXHkyKEH5k6aV0ZWI8qDw/W1OfFw5ZyAIDjVK5PhHNJEfm1MtoCXydP900B2Au3woXjnfpwNGtZrb06HbulknEu34oetPW9FuhZjg0SkYbxxpkiY8jf2voHIecxv+mTThqLOdR/lFpwuCx1klvm/PCRKePczd14aNznpNrMH+wiGmErFGnTgJeTVFRts6JnzGYKH/bp3CWQlyGbgYFs+S6PIRvT2UUoAOnjsZpVRpKwH7ZAzIwnZEvrpmw754+OdrZ8IHyWZZQxSloc65ANcFPg2mYXAMk1dkZDWjHQcXQMo1KQqzXtrHjqgyd4eNyxngSwuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/T/bHkZxOkxtNH/zCeK2YAGEkTDwlyBh4tL8CujL5Ug=; b=RibzHhdxduIz9qNOYl1rd4dOZHlLrbL6jgpv52RcLmlgkoUZoTDmcUYKdcBbgvSMTVqluESW9//QdRbv/AvwSggCl9PYMipGID/bJcyYbCxCjR2Mf8rI7wTapq3hENECMy1W95THjjnxBg/2Jh3AYrF12H4LU8V/3X+Ia+ezUNFPGryNxxMbd+oGoImlj0lOlVJPwXscJ3ZoCReiHV3tpMkW/C/Bn9kmbWTdQ5kQUxeWw39VxjbPxx6humdexziFxnQL5xwQO9x2dqne3dvAzEJde1n4xhnkjVJ+AYC+6KtoEeADdi2tmYq6He/Gre5dFw8nZaIhqLHU4FTqacPkww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/T/bHkZxOkxtNH/zCeK2YAGEkTDwlyBh4tL8CujL5Ug=; b=Voj9QLKMiZub33Ahpuh8MvckElOpRFRw1jcImdTMu07PMCSHrlkaw7S1x+xp7qP3KxZ7BMNpkzY6WhjAsPnuuB2QBmFgmTgup6lUK5/dhvgcGm3qUvWRDRNRy2Ctu3swgESd+mcRCWOVj70U7yjMqC1LJ4mJE7QbKT76lYgwzrd2Pa9KmluaF5jRTCcQO7+GHNX4hfWe0w6niuy9F8yEiYxlG7z+4ff9wfSQNZgRQ+Ar+Ngi5THncymwu9HdKsceSCaBDu1RByygS6aWiWNIIZVzv0rj3D6Lam3D78+ViZ57R2aByWIkEk0zCxtYkmR3oBw0K2YgCQXUn5We1oCphw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0359.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 08:05:29 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 08:05:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 10:05:19 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [K+mI0BTL4HgNxBqA3yl3ycnQ41CSU9ePNE1BONE1gGE=] X-ClientProxiedBy: ZR0P278CA0087.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240524080520.493595-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0359:EE_ X-MS-Office365-Filtering-Correlation-Id: 22c81cf0-6b13-47c9-140b-08dc7bc84709 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: k3I5+VPvsO6hGGeJkriuXwHOkY/shu4mNbr1M5Vgcrh3jyhQNI/m+gkeOIj1eUemgTi7DcjaJ/5xgNeVOp+e8GGVM+1jg87o/NyJKIO+G/bvVFu2g9609ayjORt2Hc8ZYTuT+ClyI/TaPRFceqSIo4uAFlC8er1XlqArXmFDAtxxeXnZGz53ce7W+N7cVud+COdq8ICvIAruv5UWDSONWLmBA38h/R6oPXXFAz8pRBbog0/G2jyk3iX769HMd9L1oMldEcpBW8UU4vaGHvVeI/XsjV2+WJ47NYBjKUrBQNaSLt55KbhLDzGH6Lm/BcB9IKZ3hz1jbFSCqT3gcNw8BiY+kuMgkGxsxN3GEEy4CQiqw+d5WMnffHq45B/EU2n95+yuh45Ms9v8vMHA/zryYUZC2DaYn0djbY927256kh1UMWln+2qlUobEisfPYWHT9tkypGU+F3cXx6vsZatxlyQuWYbgMKi5HBKA8E/fzYZTixWLax+gMCOzXrFZlnS7k3ecu2l1gWdmW59QSe3BOJ5pyMOQt2aA9/XdGoO+gvWLs09ZeyfJ/17mxoaetKVxJ74mMxIvYHnr513mgkHbBaMk+nVv5soLp8242MBlsXZH0076T1IRPw6VuqnxW+54 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k6R0lS6yzDRb/OveGass+925HabBfVGA5SGsUU/dcH0XEYO1QU9aFgnWuRT8oWVbScoTtqa+sfrjkSOrbjQGOS8f+q1+4G8m5GURS2+V3hkRVH6XdynLWES0zLIqiZSlfDGZ8xDMXCOMW0PiUABbDSIulU69R4AmqSeBabjc3mi5XptnZRGpxbr6erU17kXHUssyI6NdeyCRcAxFaTFZnOlruoVb6KN/8M7+gt3q0daOhHZpHOU60XBBq2j8ww289NOqy5RQA/K/yj8QnLi/PCypyl+1rA8GvJGaRN6x20KQFIfAFg6o7p1uH9DzEUt7N/P/kFBXFu4M8jb8QtcwkSpDPJoR8SuKt24EREAQvvcZz/tJclw1aVLnS+otRKBo8cEmloAVORyNws9brVUZrpY9OF0TwsAobLn2q2xljn4uJAD4rxyrcZejT4uQHv3cM54x/O4M/B3FlmoHFcnktaRJxQU1VbD7LASBCci1bZb/+vxgzgsOKsv91K37gq9yJkC9vlzNgIWqlxgJIHlGzs6Mk3+LhqNlBSAagkm/r/3EztskAnsj97taw0QV2oseIeJOq/U3RpgvagLcyANfejQutqb6RYw0+zJSZrcXTGVd/8vusAhrsapm8RqDUWvaeAZbYgHjSSNDQOC+2yTMS0GbAQWZ0TTGJ/fsNWHHmS9dyofG10YLuPg/Po+CDtQCwjOEZ7rqIKP5axBNjxRYrOV8/xNo3BhahwEBGXWTQmaIFgqlE9hv3AY8bWTAuSKbfKaQyx6JBwGCd3eCxVZu8oER6ecIbLNaQSrE/Cc56R3F2SaydNkkFJJ7j1H+rmhVTBk9f2gN2hOqw5zQhv7WQ87OrrgBRO7smX4b6/R83Uqh+J0X/7JqN7mhhLE00jJgrRb49T/SMXtTahovCf0i05YilePcA99rhpIHZW72Jw7MZRlJqG+2INp+cm1geuApzk7jMWlH/cwDK875gUW2VPKK2EIWGdOCuefFMpkGUPg02cTpWVNXc8b+4YTb62ioGVTSmARtncLRTqS+I/MjDvjhO1rhg24FkUx+PcQDhT0zE3aef5AR/JRj0sjI3Di8N6EqhCuk2noC94kp7GaqymGNiA2BmldcKvb4+426F8gBYZTFwMRSNk1gJLl8KSBwOnjT64uU+X+lmijPvXwHpzgBNDHX/Yd1lTfzz9GKoc8s64Yu3oftHo0sLC49UFtQJY68FLWwGLjstSPR826lGPGoLvIMGpHoZoMI+VXsHAtZvqWR3wpjJqc07jnX3FLRKTGYodWy+kQT8Tbvgu/jtg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22c81cf0-6b13-47c9-140b-08dc7bc84709 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 08:05:29.8037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0359 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/af_aiir: Remove dead code 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x0gYzordnv2w Fixes Coverity issue #1468252. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aiir.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index b5e5b41db6..324fc367a3 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -820,7 +820,6 @@ static void solve(double *matrix, double *vector, int n, double *y, double *x, d static int convert_serial2parallel(AVFilterContext *ctx, int channels) { AudioIIRContext *s = ctx->priv; - int ret = 0; for (int ch = 0; ch < channels; ch++) { IIRChannel *iir = &s->iir[ch]; @@ -879,9 +878,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) av_free(resp); av_free(M); av_free(W); - - if (ret < 0) - return ret; } return 0; From patchwork Fri May 24 08:05:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1558943vqf; Fri, 24 May 2024 01:06:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGIY+iei7Hz/ImZwcA7u6E9mIG/R1d33gh61yzzvxObJEW4SEMuk0KizRQazpqSrU7jJFyOVLONtMtSrQTDs35hdmLLY7FHTgcZA== X-Google-Smtp-Source: AGHT+IHEgef0tFbRCJFGKDrlRyAvf7I7EqEfov+OZAXFYrGGhatJAMF5cYlOHzmB4KjYE/IF2RkM X-Received: by 2002:a05:6512:b87:b0:528:c1ff:2fc0 with SMTP id 2adb3069b0e04-529616a653amr1890020e87.0.1716538018057; Fri, 24 May 2024 01:06:58 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626cc38b2csi56295266b.451.2024.05.24.01.06.57; Fri, 24 May 2024 01:06:58 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=a0sCzcb+; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 325B968D4FD; Fri, 24 May 2024 11:06:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2102.outbound.protection.outlook.com [40.92.73.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34B7668D4FD for ; Fri, 24 May 2024 11:06:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTgIma8dfFuYYk+o18k/SECVhU2umfHXbdh2a1eE1gWayhBRDR1ne/5AoZUESaNbMbjbd02oo/KNv86JKqgKZT213qqibyUJl2i535bHJ6IjSf0D9kcuGdUmCvrQHWHUUo7jfWA4aMa03NvksyCXuMsTAenOdyK+KiTIbg3P9z+OkqWaTeykZwHQVOLrjYPCU/vLXX6765lQNRSR42bL7yt21f6e3z+PjNqDppWHApGUuL57D3oOMVyN/Bx7hfA9vfDRPMrqOiji7NkzQpYyOjkSe0muiXqV1ArOBXFhyqjRBwfYB7QXsA5jtmBo8AClrPhvaG5pH/d+pkRnz/sWAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W4DCEhZ0aZdBpCfk/Tmiuy/AePQMnoS3cBPY9JUpa8Y=; b=KAuLwaG4BJqHgrE0/SRTkuPY4pmn30Dml0z0oXFWrnsIziPwneY5qx/TvNECoBOMmVsevPnjPnbO5nxJcxbKQgehK7bG17bnl4f279qGbFeGDOLkrgJiLbHt/9HSOePrXQx8KP0tEUajbWkVkk3UqeBozopC1svtqq1OdM1NrI4uUuH1jL5463GrbxzROyEdsS8G4FqunO1S8LJL6B8RyeIaMzEtn7nXPW0J6lfK9GyeCcCZppFa5snYKLZ+I1Jcm8mLPIFyoXb425uckWbOzmgj7Db95f7Dj32NLUng0UUgb13spYy8zGjAsNLqXXqUz5gkW92wobG3OWCq2TnAbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W4DCEhZ0aZdBpCfk/Tmiuy/AePQMnoS3cBPY9JUpa8Y=; b=a0sCzcb+gSmfxJsQuNXv+mfMpJzSJGcgorhuGkesZsL85IOr53tN8x/VLNUQoKEwSapWO30V1AvNHlw7+Lt5Dw/9dRjk4haXHGjdu65xL0mB0Vy5RMmKOlWJJhNpTA0C83ZKVCjHSgjeWQJh3HfOjY0Vi6HspmKRzmpn69kUp9sOy57UWgd6bHmXfZ8pGU3qD5MqZF+DpmWO8cj8xHlu6ZiC2bGk5tgDusw3Cvk4vvugg8ZVNlIpkAYWtpDdF/4Y24GiBILTePIbxIch6iGOqeGCYFgjVtryOMaatiyn+GlsU2RwwDy01pLqPAD5MN789RfBUAV5xtcXuzSvgbIfgw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0359.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 08:05:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 08:05:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 10:05:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [hOEL5wwl5esld/NNEWGu5n8fAAAY0RPmhZLFXRTnMlE=] X-ClientProxiedBy: ZR0P278CA0087.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240524080520.493595-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0359:EE_ X-MS-Office365-Filtering-Correlation-Id: a619acf9-6768-410c-529e-08dc7bc847c3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: LoAqXiR3W2yAcCG+PMerCqPcpLWQo4ersrhTWbw6t6QXeY8lJ4Z/VUkjoNG/qgxffp7uzb33YHaVFN/q5O/e4YlilMxOaTC+Lu4Wjn2XmqFcXcuTaSQPxTmtsAHLbE6rje8wg+qQeSwHLGLVgdZSEokWpAV9GxQiNK1RxjtJf8tcs6zDBO7cVBqPXEauamkJzMdK0Z8JHNuKUWpELwZ7CEaE3cn5Ovbu5hNw+4MvG+a7hsgwzO831K7khxGC+qPpCA6F+rfKb5Kf5AbuC2+Zhq1D89EBQSS7SA50DT50TxM61JI1BFtVLFrWCwtBX1ON8I+iIvWGz8MJ+zw69XNO5JvLWHwNxEv4wanj9Pcx7+E8hZDngatwOzbYVL5sCHz15P2TyFif6TdGytlQkfFS/27DX5S2GYn6LMzjK6TTR84MHhr2wmYXif4UtGNgdFJdoeuZOilinBa3D5us+cjxZ+erQaXUFqMg/Fo/6kR4kVcz/6YOStrsjcCwLRKWUr29eqbJu+BkQ2f1LgIfkbODLXpCNUa3pQ3vldUopqYFYt/I3fTqEvPcABbwqkOJSbn78II4aK/5Cut9GcBKqDPaTO1J0J5K4xWiFfXDP0L/Qq3AyXP+uGTl38ggQ2PxFhJ9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5q22DzR3na/nn8ujSvRVgHbf8Akiz/eWI+TTLZpqt/m5Wwy28AeaPlLVtdtIhU+ujOgOsmB0Ab+9F8EIOO1HbfnL/cKSH+1S8dH58NkLql3t07VDOIRUbQbrTG9kOMCC/ceLzM6KgIK8Jgr8qU0oLfcfW13FPP3Z0OlQ2hN8gq8JikCdYEent2OXR7rnllOxvmuwm8MVqGfbuJzAdzUKMUQT5VgxFkL0zIB10sVjm9kSSW/1/rnHWVD1yQCqklFGYH6qRyyaujWBCyZBZyjpU68PZ6CRQB9SS+Wb9mEVJTEpD2qc8M/bMLd7/XUqB2JHYKlaZTSyOar8Ayj/Rxxy/HQXRGW4uPQFIN1XXn+JmRpqCH2/j1b5/Sj2pzlYu1aEE5Jovd7ESur4aVvHTrm9BfSyLp3g2FlVEx8WPbBOFtnv6djBYB6ST2reF7aoWNXalpSUQKO0HyJcVKv9nyczOm8RWbGr4Dx9OgBLniGNQqcKlBMMPDgvzbE34UQrYoI4ZPkm/IgmwstZFk1qVa+xNMB+XGbD6wl5lV5ELhmQ7xydTj2IKhpo7clQuIlGqVUKdFOFNPP6zdkN3zjA2qmOz7lUmaOv7fq1sYUq/omgUNi1+qP93iPphKMyUwNyd34v9p8E3oKJkiU2pKl7TxN+m0ZOHxxWxMyjZ8w3ToFf3CDuNkczh3AZVST8K5UuWQHO/UrL5cu4M14NNDWlLPd5+9Tf2HMqvBo5vbz/eQS68oqWOkHua3UXs39t3cXMKpGLLrXYWu5V7C07qgb3PN/vsxir6nvyB1bzENR5LBhQQ2tDWZ3E1d5JAxBURzVsWssQObxGiMbRY2HI5FJr3RmHZCEDrsRO3WYjqpGYfJw5Z5maU2lcckUxsa92KsjcOxdLO01qTVWbVM41P5ESYW9GJciMLeWqk0uRDbm4aV27fy6kqM0RtoS8/w84PW6H2DzOSFUEVguMzKvw9nPyVAkQy/nSU6tBeA14vxgTunUAdkDUuzeAf68trvWI2qlyhCnRNcSTaZf3X830MLIT6JS87RYyqqq3FIJT2jSUHQOJ3dRQXbq5XDd3Y8npWb501IIiEluR9mtJ6FPrTqQUAnE561kfGK1J4duvRCEx+3FfxcP3D8jtrZflRy/8fT5Fddctlp/sDBp7V5AyoKwbO2x/HsBCALryXg+uG6VoUfmB5XTPhL2JeSwkcPBeFPxS6VVoblXow61vStD3eOOcsKoBt8+I5Gtmlvw/lEtwM+XW1Hlsubc3OUuUcMULsU6UeOYh6S50JTAZ481HxwZbuE/Sag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a619acf9-6768-410c-529e-08dc7bc847c3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 08:05:31.0484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0359 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/af_aiir: Avoid unchecked allocation 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 91qSNEU12wJs W has not been checked at all; allocate it jointly with M to fix this. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aiir.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 324fc367a3..7bd9e37e43 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -828,17 +828,17 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) double *impulse = av_calloc(length, sizeof(*impulse)); double *y = av_calloc(length, sizeof(*y)); double *resp = av_calloc(length, sizeof(*resp)); - double *M = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*M)); - double *W = av_calloc((length - 1) * 2 * nb_biquads, sizeof(*W)); + double *M = av_calloc((length - 1) * nb_biquads, 2 * 2 * sizeof(*M)); + double *W; if (!impulse || !y || !resp || !M) { av_free(impulse); av_free(y); av_free(resp); av_free(M); - av_free(W); return AVERROR(ENOMEM); } + W = M + (length - 1) * 2 * nb_biquads; impulse[0] = 1.; @@ -877,7 +877,6 @@ static int convert_serial2parallel(AVFilterContext *ctx, int channels) av_free(y); av_free(resp); av_free(M); - av_free(W); } return 0;