From patchwork Thu Sep 23 15:28:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp565497iob; Thu, 23 Sep 2021 08:29:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4ynVPlyNVoQRtA0BL/IWGEmkXj5WD7CkqZcp7zZ8b7B0gW6DXpkLRkc3/ESPjEixsc+vS X-Received: by 2002:a17:906:158f:: with SMTP id k15mr5793066ejd.241.1632410963333; Thu, 23 Sep 2021 08:29:23 -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 f21si6436838eds.595.2021.09.23.08.29.22; Thu, 23 Sep 2021 08:29:23 -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=tvTABs8O; 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 04B3268A929; Thu, 23 Sep 2021 18:29:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065047.outbound.protection.outlook.com [40.92.65.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84AF3689C28 for ; Thu, 23 Sep 2021 18:29:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fj1aXQnNjS9O8KDUi/T4MHTXTe9Ug9xrMJoNmiLdBfO9BGyMqUmFcQMYTDUTUTBnTs1zbG1uDJ8RqndHp7J6sp3KbwnhC2RLYoJGlR7Xc4a+PB3pl5nlk8S2+jb7ssrTQOFH3Pe0R/q1KO9UAFK5pxbbPEMcLlNVI2XEhqLGwJnenFKDuCs88Yy0Me2Nb+4BYMi5GAb4zIi+SIYPGYP8UgM7XYbnUiu5xnfsgS3xPxy3hCK/NmbE9/nA9x8f1gIt+eEreXB6+PIUYfLRFCMz6kr9CKOqJxS6HLx2nFba4kpaTT/hFA31XEfJtryB0e1ra+9x1NJQjj9jcWMokvPiAA== 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; bh=v7zZiQ3GdAmZKzUkHkPPJZ2mzLabSBSYFITjJcx1MCk=; b=PJG14vCsNJufsQn9uxl8B7kLph2Oy+9O1ubC0XhhQ0KJ763++yqToZUNscT9TCkcrsLC8aEY5C7p1aT1qNkSecUUgWzdIgcye9iVS+Ly0VXQZVuxJRi46seNzR2oTtxYpOTSCA6OBLhe4H6vs3l2U9gkCkVlhgFNHfauG+TIwvkl8A4Vs3i1/6hFusVwXC8W2vm1B7uCqK20sq1goWWOX4m/9NRozhnkjmEd/n/nfLPdbOLQHGYtSgznXJ2BmAzzsfObu6Mqe3jqFDMQ6UjaKPjymZZR51OgZgmq/ntSTVLsYUq5yIHlGfGLs5Bys6OK0RkJ6hPhjJrAtw8bMuvF4Q== 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=v7zZiQ3GdAmZKzUkHkPPJZ2mzLabSBSYFITjJcx1MCk=; b=tvTABs8OKdAzMVGS10fuZVEPvztj8G3/CRRIhxCT4e8upD/EigunL/1GHg3flI2KvdsOC+3VruvCwHyw72j0JVsbtJTrXU7KwBR2Q3pkgzDCx+Zjntkw8LdYLscHHbS0CDH7At6wVA967xDySznaIaM1ex3+Pfb3sIU2A3dnf0qDr82UcC0UTEzt8ubkUg82sYwsptcewuOcnEpQZ7kME3L9cdgIlKybObTr7NaJypOwbJbdOrWGS0GAIWgAnZS9eRED12W3hcGilaytNlftbvh8q69PwiG6zchc2vNJDW5Jz4RZV+9YtrqjtESCXxv4GfL0FLNcCRM/Gn+XgnfOYg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [AiprxXKlnQi77g5hYUJo9kuH0zCTkiFw] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 867c5d8c-a007-4f7b-1fa9-08d97ea6e430 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UuTYk0YBKgUpaEqMowN4GwiZkpA4+K7rLQbzMHP4Z58z6NqjpPThcPIPoCRiwm0qTrLNEjn9TgE7BVS40io1evpfXQn4us/YIbYUwjKx8y6kz0KSO5KH5OfQXa2NQs3C2bQ7lEQLwuSQnZczfaDjOib6oaV01MFRune9HjxxQcLWjsmi68dFFsIkHHYTDZRcvOR8AcRh6SA6/yImrwfhPdhGMxWRSGDoapbcgcK5vxteFNUV+zWfeWvCbfi3GEvgvDrJ3mczC97nAO59UTJ7Wy3Hm4ru6DJ0gVAGpkR4eHocLVa9oXkrG4HckBOGqDBr7pi58dgPNhHpHmCZTzxi+dVNole2HEmLXxzspDxIed4VJVjFSqW3IHbOSVlmzyKNZva3dlEZRv0w5Lf8XVvG6BIuV4fydema5O5ZIzGozXnM+zz9rEr9veZxkL2tk0DC2fnLsRUhjOFQ0mo4Pt82HagGaqui55KDy7tqMbzhF6asIVcJr11jU7Ac5KC5r5h1Ss2mHQ91IJPqEapBhe9jSGc+lq24mbmsP9FuK3fRUzDHuK7MVDlANJw5H9sK02UMm4IdWN0mXw0JYKMiTyev6oEREJMRJO5AkAQAvUhdiY6UAj2X6vf7jY1VwBR86gCurYg6hdsfA4H4IxTLAPAy5XZxmPo3Xsj/6rDokHnJpEFhiiBa/T+u+0hU+qkK5Z9xuY1i1THugbJTrGLohGUe1xJSg0T2GO8r4= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PHh6g5nEPh3VTUai9F4xY7gdDM3zNzZDYt7igoF4ofMhZdJEYmC1MwZwGRk+dQLj7mc5vTrZIPq5mdPREimRNkCnRKtJfY8hlA/EmP2paRCfJ5w5KINpWfEGujZkv6YwYuS1cgaeCi49q7jQbnG8bcQvBGpDBr1oOxX/IFIuoX2S10Fzr3BVyS5aiNF1mfVCm2XqiZn5BeoWW1q8pfdys4uTUMw9pHtllnLn3JZC+NuGia1PRnh+lPVcodWVoBtNUPHdCSq+m33qmKn+783/mAFu5lbyNQZ3UN1ObvbjNWX6uX5cz8yAIRkqO3CN1T4WZ9gx+VcYKHlOCQhcwHt+qf5+RTvedEOUg7ox7MY1YInQzMsaqBf1UzxQFaOKRsnu2kA3KtW9JXAlfMkDveJ+bdKdmBl1UwK37SjmTvOWCeFr71Ws/EGTYBaroHpnsCLT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2IleTFHr/5uB1F5fk4Sev8+Sr8PhgIyMvlmJfucSC5N0lOuMPjSvc44E83AoTpd41NdNi2X8ohImCEDaXY1JC7kb16WxjeX14G8fuvTuOW4osLWtJCt8lUgzZCP85mVGP4GEtbwVjZzVYVEzDZzeHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 867c5d8c-a007-4f7b-1fa9-08d97ea6e430 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:10.9876 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 02/27] avformat/chromaprint: Add deinit function 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: Glypya7HT8n5 Fixes memleaks in case the trailer is never written. Signed-off-by: Andreas Rheinhardt --- libavformat/chromaprint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index 399de725d3..b7a943e126 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -47,8 +47,10 @@ typedef struct ChromaprintMuxContext { #endif } ChromaprintMuxContext; -static void cleanup(ChromaprintMuxContext *cpr) +static void deinit(AVFormatContext *s) { + ChromaprintMuxContext *const cpr = s->priv_data; + if (cpr->ctx) { ff_lock_avformat(); chromaprint_free(cpr->ctx); @@ -107,7 +109,6 @@ static int write_header(AVFormatContext *s) return 0; fail: - cleanup(cpr); return AVERROR(EINVAL); } @@ -156,7 +157,6 @@ fail: chromaprint_dealloc(fp); if (enc_fp) chromaprint_dealloc(enc_fp); - cleanup(cpr); return ret; } @@ -187,6 +187,7 @@ const AVOutputFormat ff_chromaprint_muxer = { .write_header = write_header, .write_packet = write_packet, .write_trailer = write_trailer, + .deinit = deinit, .flags = AVFMT_NOTIMESTAMPS, .priv_class = &chromaprint_class, };