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;