From patchwork Thu Oct 7 09:31:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1283919iob; Thu, 7 Oct 2021 02:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBYiFwXWtTuxnF8Py3pSnRMNCtSHOslyEfQTPc3AdMgcgwi0mB/XbDYfMVnnX4/ZRU8jVW X-Received: by 2002:a17:906:7ce:: with SMTP id m14mr4409574ejc.192.1633599108605; Thu, 07 Oct 2021 02:31: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 f11si8094636edf.613.2021.10.07.02.31.47; Thu, 07 Oct 2021 02:31: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=AW7Ma50p; 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 2E29E688156; Thu, 7 Oct 2021 12:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2054.outbound.protection.outlook.com [40.92.91.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8880D688156 for ; Thu, 7 Oct 2021 12:31:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTtXGRc+4HFsDSWVfHWvaSMHvZbxbw+N1EJ+qEo+pnjCd07Jp9ZE6NWTvpZtZfQOD95ZxiTLJpLRdoeTK+2za3oez5ow5i6TEs/mtD/EynjyzFe3RkPvRZRo/aU4Yp4UM01iY6C4P2cr0q6fJ7k04fMj/Q5yCiCkghWiPZJTgCfSgysS2BWbhR9mmW1PVN7OHBv0OA/TGAogr3RKydRLdBmkVIPPIpc+m1ExsPmZKnj/QdG1jywYvt2WX6Vipu7g/U/WT5e1edkOgNd30mHuauUHyBcDrMtg1O4aDVGdr99XYt1UvpkbPo9zTmKpp61fbgafwfyhAqmMwl5Jw7UMYQ== 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=uMmlRlVlGZZECat/IfxM1EQeu5GDXdV2WB+UwXiGdxg=; b=lT7Gu525eB0FwF/NuZJVlZX0TBTAz/3vUfSUIseNpr5ZwzFZfd91o8qMeTbYxuEmaI+0V29VPSAk1AbwyVKtkv7cD3PakIXnGibb4dIfZVpQuua1uJbIo8osSsp3BnI+3AIIKAm8PxfMjSzuIW3mxZ1jaxnt/etwGkJ8QZUJnE7EKg02EOSAO09kNMwkrGBpIvG5K/yypdLb08zumiZg0TEYhzCWH0INgZmtvy5awiSmAGlReQpcrVnlOil0jcHU5KL1JqIPa54VG64/vFR0LqTMeT0ZilM7cHsnYzFXg391YI4pun7IdEQeZ7u78ZUzu6C4C+Gqj+hWAyALySe3cw== 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=uMmlRlVlGZZECat/IfxM1EQeu5GDXdV2WB+UwXiGdxg=; b=AW7Ma50pLFy0WMiuTNdH0GHIy5L9g0AaFlzDVQv9WoUG9e1Rif2MLqzlc1zZbVmUVS6PaoNLQCyHsHsX3hfycfAbfHbW2UbiTUye+ny1aCdBs+8axvl8882klgkYTCirM6F1T7NvypIZXegOEfNXVrXv/u/Zp8QntR6quPcIq1k1MzMN9oqC/SXGOhJeLPjXZVpw24EneIhMG659CXY9VlwNULiLn8hH4arOtnir8Ft4hn7Wa0MBQQoHzOl1Fo14a6tySLloiLf1/0TVJj/sLPNojLzfu+tG6F/kgg0AhJ4ewGDXaIzsEy5s59hbm2AwuZ3s5TunizlLhZn8LqQcQg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5605.eurprd03.prod.outlook.com (2603:10a6:20b:da::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.21; Thu, 7 Oct 2021 09:31:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Thu, 7 Oct 2021 09:31:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 11:31:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [S8QTzHWEUKNTlEG8vd9VUYCyG4ggUBkU] X-ClientProxiedBy: VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211007093128.684774-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.16 via Frontend Transport; Thu, 7 Oct 2021 09:31:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73dc0c87-f33c-4b56-10a0-08d9897541a4 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3XbbBpNvm1g/7G4vT1kR4YeXl9CSOTN06Pr1ziImZ1jX3NwLyCS3bx7WvvFHnsdsCKa938fBE/qyYiX3MoD9p/E392OaX523iPVw7itLzD4OrVzDErpocQc+R5udpHct06U7bs0jYCqsRx8QdfKfnEHrqd0gScIbO46U2SgeIPfFPfuJWMAmrinkkTeVX/DROWySaPLRI4tdLPGF1o7h8LbeU1UgX1OP29J6KocdIQhnvIDBbuRreca+8vAsK6Uo6uGnchH/QmpRvLbuXlRJt51LnPgkFaPcmij6XIyOjvI3YixCsSAEn+4X4erJG0BvvoCV6rxgwQMnIldRCei8MZmC5zjoHoG3mO0oPED7yMdtKPOHnG7o1QLH4rjvsTavSUAVQuSmZhV7fKW9aGtEM1vVNijRpNRUj3MtJU/q/fUb19tIDP+azFh5im1iC1q8dxbRQmBxtO13IDipVh4i0Sjk7ksOePaewuV3jP+GD8SrDk6Lfm8RWnive8MQiv2MpwMmttN31S81cZJ6jy/DZmcNpkiRICW+mJ2LJT8UzBcvh6ai4uWoxBmtxQiqra9Di+KjvuJeBwsqKluY/R7nM8tAjPii46BvTkDC/ECAmXVZRRGe/aT+rlqCGk4N2KwF603i1A01lwCUROuVrevTTGB92KJP5ggrEFhMsQ3fvvuccfMutzfeo8pFu7TrwzixyarQpRaZQAmwlRBMrxdHARrr1nI+5rV7UA= X-MS-TrafficTypeDiagnostic: AM6PR03MB5605: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dG/CRvwplugVPcm+3zxQgFnj98+rK8WAH0g5jpCip4ilSYF7lH0l8PgPo1OIdIk59UxUI0xnp4cPPYyX4WbH9d2S3Ghj4bqeFmBaTC80EzUo7lnq4ytUUPSeRxNzKHK7oB/DRnQMEWSk1vBge4Ale73gjnk8hJhf33gsxeE7Hs8LiE26JyxJlq2+Rin1BdV8fU/Ai10n7Pns7x7p4Dg1t+cl1MK1JuD9Z3WRTpb/amiIxJezInGYGkqU5lANPSfr3pR+ywgfbz9Ri5HRtmeJWQ7CHIkPxS+zAFPgxSFGKDD1yPrzYB8ellELZrliEj6lRXVPEIZTUUUMH/yiYgAQujG8BDQQ+Knsf9g/MPhXjqtjnzqIaEcVzGLDkMHe61jLyES40KipG5QDQZCa3SysAhOBQzasIEVVZJkQt8kxL8XUjj/0TFAsUPSIBg/8bR4m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: swWYipjUayAEhulYXDjBxHmvYaDQ68IRLkzhdrGeMZhY6QnNn0PaHMHbrBAeNznBAGnfGPavvkfV3qFIKQ9LOMUPelFv6q+fJkFVPgKZqs6A7ZKKEtmbwdb/SbVqHDpo40jNKaznoJuET9/p8g2opw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73dc0c87-f33c-4b56-10a0-08d9897541a4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 09:31:36.0193 (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: AM6PR03MB5605 Subject: [FFmpeg-devel] [PATCH 2/8] avfilter/af_surround: Fix memleaks upon allocation error 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: BONyLkHrzJ90 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_surround.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index e3601b9df0..efdf91a391 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -200,13 +200,13 @@ static int config_input(AVFilterLink *inlink) s->rdft = av_calloc(inlink->channels, sizeof(*s->rdft)); if (!s->rdft) return AVERROR(ENOMEM); + s->nb_in_channels = inlink->channels; for (ch = 0; ch < inlink->channels; ch++) { s->rdft[ch] = av_rdft_init(ff_log2(s->buf_size), DFT_R2C); if (!s->rdft[ch]) return AVERROR(ENOMEM); } - s->nb_in_channels = inlink->channels; s->input_levels = av_malloc_array(s->nb_in_channels, sizeof(*s->input_levels)); if (!s->input_levels) return AVERROR(ENOMEM); @@ -263,13 +263,13 @@ static int config_output(AVFilterLink *outlink) s->irdft = av_calloc(outlink->channels, sizeof(*s->irdft)); if (!s->irdft) return AVERROR(ENOMEM); + s->nb_out_channels = outlink->channels; for (ch = 0; ch < outlink->channels; ch++) { s->irdft[ch] = av_rdft_init(ff_log2(s->buf_size), IDFT_C2R); if (!s->irdft[ch]) return AVERROR(ENOMEM); } - s->nb_out_channels = outlink->channels; s->output_levels = av_malloc_array(s->nb_out_channels, sizeof(*s->output_levels)); if (!s->output_levels) return AVERROR(ENOMEM);