From patchwork Sun Mar 12 21:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40653 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1266698pzb; Sun, 12 Mar 2023 14:52:32 -0700 (PDT) X-Google-Smtp-Source: AK7set9KM5ZGoJb/Bb8Vepe5fqFrR9R5DA/W4hqEnE79c4rjzNtKFNqiOzRt0DT61eGj16UI6Lrs X-Received: by 2002:a17:906:22c8:b0:8e6:1726:df82 with SMTP id q8-20020a17090622c800b008e61726df82mr8740780eja.30.1678657952139; Sun, 12 Mar 2023 14:52:32 -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 x24-20020a1709064a9800b008b177104a57si5460801eju.344.2023.03.12.14.52.31; Sun, 12 Mar 2023 14:52:32 -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=A5cUuJu8; 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 88BD268BA7F; Sun, 12 Mar 2023 23:52:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2065.outbound.protection.outlook.com [40.92.90.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9CE4689C14 for ; Sun, 12 Mar 2023 23:52:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KkbNA+vYxAH/XB24a4qMkgP7WBlB8tWMiVQGUwFrqU9le/rD6ryRv/CmMWcLxE0+dCSDmpbI+7vxTr48c4UwnxitYPTrPIxRSAWbJR4Ro74+F048qy8wh12PbwJTa2QMJwDLmMOa9AiWCBv9TcYDPT5kjZGPDlts+QaRHhWNtKagacMxetkP53vEX2fZ3A4zMHH8Dterz6to+z3XPBLT514kXC1ACNBzb8cUBGn8TMuonQ9SSe9VFYEmXCBJU/s1tPA+BotrPrGaRaHD/XlVlCrOZVulAYNM6nGWm+BbKvoKnGch8okMTB/poPCvtXV5rE89gJhReCRXfzb+vQF/bg== 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=uKVCx2hUY9LbFo71hRrubqilE693EUC3iWeqDF/Uesk=; b=mD6PkW/HLzqrRFQzm5nUt6H2/zPEJ6iB51+r0G/7LwQOKeicx/OZDaKWT9Ho3l52CEzR628E4lqz5+ZI1s/4gwhAjePOyhgdaGW3fd5D2TCrbD5ElXNW+NUqIxr1wzHmIm40XNWGfyZoNOi48h5sU6q3DefRn8bFigCnJAUW8hhZ418LRq11nS608MqZxzbtBe3rTIQsz829jTrYBCibGOJy6VS32J0aBkoKW7rTKrB3SeamZ+WOHIW7CHtojM6uFS106UGW6bzl0j8pQQc/obgsdRqZHHuyn+QYKUl1JSiuh/C/RlWoqYHS/PAHWaVvdBpZrAkUM8yETmUjs6wf2g== 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=uKVCx2hUY9LbFo71hRrubqilE693EUC3iWeqDF/Uesk=; b=A5cUuJu85ea5B6DxWXAD/YWyBNir4qZH5V9zZgBRG9585sPR0IXAqRzKULwLo2TxvLbNVS7AIqWIrCjIs/Pdw+XjdaaG0fQS51nC245FtPY16M+uzMB7wesmsexhAMloGGT7QS1tUayLnozr0jqWRzrU1FsCvVDGaFGSffmlUXHeUHK6t7jMMD9t5joDP18kGe26nIIu9s9xNTbWXC+QN3xCoGyQ9GB/Hsd0P18Mjg42RaKZHZ8ZMrHr03ZhkZ8HlmtLU4x1/z1NeKpCvrdi80QuFRUdBZ4ZnJ58Lwu7dMKl85h/sN8ULiyE7ltV4FIga8AJdJl+GFjs1AoBM7PGoA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV1P250MB0907.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Sun, 12 Mar 2023 21:52:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Sun, 12 Mar 2023 21:52:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2023 22:52:49 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [RJIT4rgGpodW4bS2N8YI4PmUbMQHOj1WzzFXRTijfxU=] X-ClientProxiedBy: ZR2P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230312215251.454737-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV1P250MB0907:EE_ X-MS-Office365-Filtering-Correlation-Id: 51d883e6-af4d-4596-189e-08db23440e5c X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U+U1ZWuGeDU1Yi2gWVdh2PRlIE+WdMyBZdtg5geTbYAnTzn4Mn3C4MQZgujJ+RcpNeEjA1v5eaPXbNv+kyRXmusDZCv9o7MCHuc7CsAw9Al6ss6clI5GXiMvEQR1W24FFf4qku6ls5Zg9j8BapuBiIsz+EKQCEp6nRhsSl7f/TUk23R6sjYJPedbjvlx0+diR35SEdcIZeeJ4QkbkgQ4vTwBIvWYqJlcTvQz+xCJ6owvxWv7TUyTqRxOLvLxKX35tPpi91/fjUMkoE130R/Ra+d8ltTqBYGfq1CXg+X4RF2sSsdCgtRk3g8DzJYmBRu83E55RWZp1RwXdekP7xJwZt9rwYy3CGltZ+6jiMOkNvcDPU6AxoONNM2LO6AnlSPF1A1lK8Ivj7SDsx/1W71TvlCa/y8zDn50iOGB++lhd5Z//N//fQPsOnX0sJFKD6pC5e57EPL7Gpe+G8xst+SmJ/7IdKhv/alxkNTJ5Bun41YFDHglsBAjExYXiWyFdNSJbPh/zjj+6xx/osFo4JTKuejq84uGV8CDf4VqmszNmO3VBBDs87DXAU+MM0Wu/mW6rxvUpBeo7ClaOy+ObIRHSxeHRyw9hKzAvg46EWZ+PjhY7HxyByzceHg9IwEFfzPrCWaUJ9GdqdjlyV8iagE+eD4tsXGn7HcSMyo4fP/E7oJAXWCXPWSJcJVXt+q+YivfMW0ql0p2PhUannzUiY6z1kWBu/wCOYSZ4co8dUo5IxyaA/cS9XZlv4M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2NcyJW1N2zDRY1zY1LNgw4DBqU0lMGoYpnT29nApkFNp/iW7Uwy/XEqlOlsqXm86eBc3jFidRIIccxi2wS2C+3VZu65kokRbeKf9tELu0fdlTvU3iLkapjz02FK5it3IfCAAdbbpxWKTZQIludN/UteirXdT+pfC1fgOOz18+c0DgSWrw7K3zQQvkSwTK8q6h+e0/DTiCYmcKmrIwZXOxEMOjKu86jKDtLQqcKZ1XPTyACToOLvBHn40v1f8D/JvWIAjrALF2bqguBd6Jgrfv45u82pzfvXlcem9a05H2DsxcuSMgv+TdlLWyqAlMFwo97CdhmsOTB+Fu+Dzh+SIQrBjSaPxGlFblXANkX5/rlw3b75L7nEdii0oegA/WEgzff3CpgOHAqWvutFpX1bs1e5MG/CmNxCkaoo5aT0zkdE3eH7xdjJr/F2dwMJbfyV3/HXyEoiuLfSyNRAGqc31AXUeFXWXdXMm0EZn6iGDgSn6Hk9SbHbGTTrO321jlINOzVBGJQnLNA+a6AjM3RCKyqEFGIs4dx3dw7PpOHWEjpqUCePWTo7wsNxE7Y82mMhDIUSVEzFt4ShLIVg9AzIMyfCqLRyy6aHBKHBB0Z7nMc/YOx/kYkMDmh9Gzio7DUcaJJ6Z9pGR5/V0bYHJJPlfmIFuFxQDIDGMArXMG3dIAGo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i0sYzsecSmn71f78YM0mWPwIEn40mSW6ULxayUH+iXpocsDPhBkWgKpDE/nG/24+lKkTXlbtNhnQ+XZfgzF1B4hqVoBXq7iWlUYgU3sdsL6vaio4JhXpvv7p3hlF+58KF8tNXpvQX0LpQvUoUP1L1uIQtuf0GEYc8ePkxj1oDLYkNJdPd18afMjj3YqgOFiFsKXVf0CxI4zg90Gj1z/nNTH0xUbF4okO0VTEnGYcNArkVfRtk/ZbGKmSfpHktoJY3hte+SPZ4puSPcLnRu9StMh3ly0PNyTg9jUQLhQ9J/5q9lGSW7f6VcItJGSSqjJsGzPvMb8QM6JCjsJvqTRUu8WwVfcRAEGYlVbquWT03Sv/nfqzSKGeHmxT9gJTyC9o73Ar8SLee92vkqIumb1rok6AkKacRIlqTDyrPG5h8h0YdH+Le70E2/JzXeiYJuN5RyvXn5qsuO45n0Rp6o49UfiNHH+470tgcjTn89cuizFh96n7X3vVWw5lfmQUO5vKc+PWWpF1cpiNq3l1ZR1oZh0p518RFiqwGk/l73QYfPxeZmSJFlJ2Gc29ervRb48lt27L88O8h+YL7G7kiQMOrEQO1NjTTb8XFKC8GQ0TdlqTHsT5pJiVGCeNJgXA/0LIqWyz47Q4m+hDtcgkkVXY7CUdNNOFlvOLTDMo9HhHX1SA+CBpmQ1veOIz4cHR4yKwFA3rDrto+piDqMVtra4BIIm5wy2JFR7ngSdW35avstSAFAP5PKQANZmxucQ2+an681w9jNzVOpV3u12MsSJjI9e3BS4vYA7/51mcCu+G3OOxwHhN1Krx6oms1RuTRKrqOOiYqMEHFG6xMCUZloFS8h6LWqp3RxoH/aJRd2dXhdO0lqgg2PLJ4yHT5m/Y3S074WPQ6B9KuQgGaoJra+kyqD6NmDEI51/3bW5mBPonYmqQZ1KI9YsUnH+BGzdtFIet/Mx7I1QpPvphL6qnbUbOrZHs5/cD/cXEG64eQHAPrZVPFV6pw5AwNmQTxxlSgDxKbgpnysV8YngevrD8DsxD4R2PJXk2SBRns3fMVluvETp3WOVRWsqjI9mGNnMqZ1XqbGuDEBP2NtzY4iuTqw+xyOD9gm4qm5oEf2i9AX0988SkVen87bopNaLYM0s3NKHils3yAG+ibLjlBnlSV/pOsUQN8tijgcDz9eVtJhnOEKK6rlw8HC766AySxOsDdrOfFvkiDlyV1KlnIGjc+be8F2Kulop9qSu1A9L8eOlocW8V/qWlBbuxQWzmspCy1+bcmksyCQf+TViaLr0euH9SZkmb8PEWhSWJWG3++yLRo7HR+5rCZpyFJxH/ItAgynNh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51d883e6-af4d-4596-189e-08db23440e5c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2023 21:52:21.0909 (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: GV1P250MB0907 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_ssim360: Use correct type in sizeof 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: RBGvGLLnX735 SSIM360Context.ssim360_hist is an array of four pointers to double; so sizeof(*ssim360_hist[0]) (=sizeof(double)) is the correct size to use to calculate the amount of memory to allocate, not sizeof(*ssim360_hist) (which is sizeof(double*)). Use FF_ALLOCZ_TYPED_ARRAY to avoid this issue altogether. Fixes Coverity issue #1520671. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim360.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_ssim360.c b/libavfilter/vf_ssim360.c index 3eb8e43bbc..f8ce0744f2 100644 --- a/libavfilter/vf_ssim360.c +++ b/libavfilter/vf_ssim360.c @@ -1624,7 +1624,7 @@ static int config_output(AVFilterLink *outlink) memset(s->ssim360_percentile_sum, 0, sizeof(s->ssim360_percentile_sum)); for (int i = 0; i < s->nb_components; i++) { - s->ssim360_hist[i] = av_calloc(SSIM360_HIST_SIZE, sizeof(*s->ssim360_hist)); + FF_ALLOCZ_TYPED_ARRAY(s->ssim360_hist[i], SSIM360_HIST_SIZE); if (!s->ssim360_hist[i]) return AVERROR(ENOMEM); }