From patchwork Mon Sep 6 02:27:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373675iov; Sun, 5 Sep 2021 19:29:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1h31qI7zBthzgCBnSGeqKOQu51hE89pMWJhT2RDDF5N9ZMoSM1uFgTLg6mfAULByq+Pb3 X-Received: by 2002:a17:907:6192:: with SMTP id mt18mr10996003ejc.378.1630895374064; Sun, 05 Sep 2021 19:29:34 -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 m7si6762525edd.419.2021.09.05.19.29.33; Sun, 05 Sep 2021 19:29:34 -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=h97ph97j; 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 3939368A7C0; Mon, 6 Sep 2021 05:28:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5165468A78A for ; Mon, 6 Sep 2021 05:28:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HUroJ2uLkrlmGMn9QOZhEASMwEuR2TW+rnMVmezRCRFQOxSHJj+qg8XcLg9+6iAZpu67rSeE8PI1cK6NAMquTeVCSXmCy2hOCU8OkIwbHxVuCc1787ZTMN1UTsEJ7f05rIXEvm58LEQwqt2gKJCGURQvFuo5jb4Dume7RGv0UJsm8yl5yuzO8w2LCwH4q1PmnvA9O15LfUgJ1uAlJ066m7VrXSPpE6qWMNHz3aQ9KnwGgfB6iM6cD/mC+zK++wM4c0wPqD6i30NoenYPCMdqIRurR/l3mL42c40/aW1BPkFq2NMOdUX+LatX6WVOVjtZ+3Z0UzGldPq6QClWgxmJaA== 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=pqQNVKMvr4X0MNcgEQbdlnCRUI90r75B0D9b7Rmkp8k=; b=GSLUIQPL0O5TVsvIY5lSZ+MfMHs6VTmEFaCykcjk19IcKsUdWJ0DhLJ44qFTgQJqA4YxYq5BKhM8vei7xHFkad68s1wnFGmZ0Osa5RRfVbBL4rb6FBiWvu/A+VIJEAnFa3Ss227oEFx7VRSgCxS4f+BGvqphdO2vzWbHckM4iYHNSJCVRA+VdBLn5Tz1bkFvq3hQB8LHvOcdIB1Ta1qojdYKkCbbpn/GUzKzwHMb+IJrH6nE8B0DmrNOXuMjyvG9KzoAlvkVWzQOIb88bfGHycGjcS6STlYx0b3u4b2gnGfCn1kP1pgRWxuDL//hZeMb6Id9w9xFWd1jEf2O+yEmcA== 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=pqQNVKMvr4X0MNcgEQbdlnCRUI90r75B0D9b7Rmkp8k=; b=h97ph97jVRSg/SaJQIDMh0K5ARe+evAiSgUh/MeHsApL0J9Le2AajCnyWfjnD7zN21DKmD2RiqsAjX4wfBsEZ57fHC9t300TL9BoBbyHMbEjnpgMyL80nJFc2BeY1UYM6zJB0Yi6Qocr3uPDUKcY18rRHdqreCPERXWYOUcM5htsWUr8yLILt/X5KSNVn4h985HiUJQQ1A5pUeT4pLKBNKLE+fBcaCZFX+SuEyiC44gaKhKWVS6RkOAnP+egRNlFd2MAI71m+vlCmQkV+Sxu47H7lXEo1sBQB9FfwDgfAZqsQv9Rim7D1r6cxtRCnJtvl0yj/5gE8x5DQgURW/loxQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:22 +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.4478.025; Mon, 6 Sep 2021 02:28:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QBTyoDb9ehS8HiKmArGtrSeHR6YEiu5t] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 094711f9-efd1-4131-e7f4-08d970ddff71 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8njj1gfAO1Xv1xyaFJhXQ7Em2qgzJIrksorQGH4/Y1Mr3NX0u9a2h2u1d+buctFWKsF9U6ZZXa7ru5IHRpF0d+f37kXoGwqN58Qw+FiFXIFp7w0QQjj7gcLEUNyxwLZfzDORkIAkKfAG8Ye6tTTmwJ1NUnAQ6qKmTOq33bLI8H3XqTJ0GjDgwqz5H54dvmwhXXOFZgHHMYaUHpQmu/9KKpIdLMU7bZv/HN70zAA28p5daaC6m1+3bzJC/oSkxF7PdmvEdRweabZT6f2gFs5rG4ap6yG42JyUNB/G3lPHa4MdG/+FQdOm6V0mrjo5anNrXzHWbr+v5h2Xnl4456rGBAl7+33N74F+YqcAunhEF0OjK3men1D9WgYRDbl+8DJcoYkOEVcR6BtGoNQUCZz6RGzT0PLiI6TPSY5rAivdBwKCvkmJmoUf14UOvC+EXYsOe+VKgDBjQf2TvSTVzbhHbRp6h/ltyooPz+fLx+96ht7FPdVQi+WaBGjxUdkDZx3Lu//yhszkp0lHYPpEHRkvKp5JX9NTYy3BoW2VLyi2GeBE8HFUIZlxp8m7bgdKgd8OZBpZNBCxPIa2tXhTDC85GhPxy+Hp9sCCnTTECZliGfK78i4fALQSgT+3pGGMxlrhd/hTwL2276T0pXRzqXZyrnh8DW75FZ6JOyoIBJaNMDUag== X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JnLma/LTTk3mVyVsS1BGYtH16uGKq0V5xgdSCK09gxQWhjtCfy7Qy0wRpuT2d3tZ8zgndJDRjYasP/Bsbn8IgFc1iH6z5ePTkeN7hkA0AnJFJWqi6/UMohHo7/jaPNHjteDNUDK12JFwi+Kg7dgB8izvim4EwuakQHPInvCtfe9m2ni1hAmdXr1BwH8alHzin/gdb8/rzynE/tIAVIGW5J/2/WdGGlbujEUiUYB+/DsB4ZR0YivHQKpYIT5WsE38jp2laPIMnXkaWdNA6pI5NCZ6tKIZg29Ifo4JXho6Cdcev0Pu4GFmaLgXy3pJDGkLWXNgIsLgH0ugDx22vy+9GnE1K2d6Z8WcyPxt0P3IkEy+xZ9w7v6C/sSgOjospAI69/sTOzpwbfPtLJtNq9glFrhoejnEkbqQQZ3vOSakPU1a8pu6rrm4ht8qBg5bseqZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PlXqAbHNMXdXvC9akeyufyEKigpgL1G6OOVGKWSv54VEA+UuvE++qwW0KoYDNnW/NU0f7qBZr1ROw4TA/qdIATayrdbhvwhBx32EIuI8KklXmxUeBNSf01I/eNLlz1NoT3s1wOdjQbDQsG5eVoPX6w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 094711f9-efd1-4131-e7f4-08d970ddff71 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:22.7285 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 16/34] avformat/asfenc: 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: NOZ29sP2GOkk Fixes leaks when the trailer is never written. Signed-off-by: Andreas Rheinhardt --- libavformat/asfenc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 8e9b7ffc28..e4d74c80cb 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -765,8 +765,6 @@ static int asf_write_header(AVFormatContext *s) * data_size - asf->data_offset at the moment this function is done. * It is needed to use asf as a streamable format. */ if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) { - //av_free(asf); - av_freep(&asf->index_ptr); return -1; } @@ -1110,10 +1108,16 @@ static int asf_write_trailer(AVFormatContext *s) asf_write_header1(s, file_size, data_size - asf->data_offset); } - av_freep(&asf->index_ptr); return 0; } +static void asf_deinit(AVFormatContext *s) +{ + ASFContext *const asf = s->priv_data; + + av_freep(&asf->index_ptr); +} + static const AVOption asf_options[] = { { "packet_size", "Packet size", offsetof(ASFContext, packet_size), AV_OPT_TYPE_INT, {.i64 = 3200}, PACKET_SIZE_MIN, PACKET_SIZE_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { NULL }, @@ -1141,6 +1145,7 @@ const AVOutputFormat ff_asf_muxer = { .flags = AVFMT_GLOBALHEADER, .codec_tag = asf_codec_tags, .priv_class = &asf_muxer_class, + .deinit = asf_deinit, }; #endif /* CONFIG_ASF_MUXER */ @@ -1159,5 +1164,6 @@ const AVOutputFormat ff_asf_stream_muxer = { .flags = AVFMT_GLOBALHEADER, .codec_tag = asf_codec_tags, .priv_class = &asf_muxer_class, + .deinit = asf_deinit, }; #endif /* CONFIG_ASF_STREAM_MUXER */