From patchwork Tue Jun 15 23:31:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4310038iol; Tue, 15 Jun 2021 16:33:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVljOu/pj7wVIz4rCYsEezW821efEEmRIXtk6sem5GqWzzq+WoNBxRA0Bi9c8bZ0kuZRv/ X-Received: by 2002:a17:907:628a:: with SMTP id nd10mr2081440ejc.326.1623799995920; Tue, 15 Jun 2021 16:33:15 -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 10si398037ejj.654.2021.06.15.16.33.15; Tue, 15 Jun 2021 16:33:15 -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=RTSGLcmK; 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 3E5F66883C9; Wed, 16 Jun 2021 02:33:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2064.outbound.protection.outlook.com [40.92.89.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81ED36881EB for ; Wed, 16 Jun 2021 02:33:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LHxIwbPsh8sSb47FQxXht3KKXq0IFg2f0/UaVR8++fgMqFn6XjL8ZdEwjyr5Rks4DyKmMeSTTcg3xNv6zW/jz7CXeUKE0OTgeCHHVz+w1R+G/sHyAuebEoOlOYl6ztzBYC2qOJG0Gn0L7ZwaybD/MZWnAyMtYInwsKqxiw0oTHyGxtqUtN3riqPFKpiDG7mzsfEVYq82a+DC6jxOHOfhJlYSBmbrNB5P8e/oCWnOy8rkZRdSKXAjoJggO3f/q9QvsKoK/2KpEPHsw4AMRmAJKSeAwBbu03IPpJmCq91qLBP8252Wh+AhpREYCxL/3h5tTAzu9NTaw/IscFRLCpNcVg== 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-SenderADCheck; bh=f8HctTpLHxAy3ysyxs3B8v4fFmfKYgP8RHaYeKrGeIY=; b=LX6UOxjWpN+joW3UiQgz5NUEgtmkKTXwITfddhWm9L2r7CKMd8M6RY55iU2j5YlRUWWZWblgmAkNex/kwaqWBntVpw72l/lWiym/1agHR4SZoyvGONVOxkHJojXnhPY74o6pDRYNgIvkZN9GLjZ4zq9enFcvLTUlxYAHysmLgaNCTxjUzTFlXM6o4FQTlyLAEWdaQbF/9NgSTcTjL5SazRRcjvUfvEM7527bU0tmDqzc2yLyWywERE+xG7xvMwSNUKB+LX1ZQQa/utjJGHW/lJQZyB+BijFkkxWQWrwHYIhgPT02H60o5gOtGPm3624zixE+hfI4OzwJ6wmycTV8TA== 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=f8HctTpLHxAy3ysyxs3B8v4fFmfKYgP8RHaYeKrGeIY=; b=RTSGLcmKXwTUc+vYvZitBIJGR4cyA7DdRyt0pRBm8y6x1G3h2lgRbSSig8QTWuHgD934dlStSNtiepjR2iV33rs3LGNH5uMlRYPOknEAvcPLrt8eVmY2n5PQymlGzmbNjC82QKkBZYDShwDy9xSOCR4ldlRA4Jvb3T/0Si8FaxqTHTM9vGoRcLBRYopgNzpYFtBwoWkMFlSrCIedYE5r6TuzmSL4/yQ3SGIIHqtAznMg49gH9oeq9J7iBopIQuUlwATB6cRiejeODBFiibe4Q7a/GXIu4AK9Bs+DgmBZmb5lgEXMGsPnJbca5T91aMGblv4W78mY1WkDaEvsCfW+2g== Received: from DB8EUR05FT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::41) by DB8EUR05HT113.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::463) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 23:33:03 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::46) by DB8EUR05FT045.mail.protection.outlook.com (2a01:111:e400:fc0f::383) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Tue, 15 Jun 2021 23:33:03 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:02B8C52D51436AE5EF37738A4C1C94AC9B87978BD999D0A0CC1037C2AF134F91; UpperCasedChecksum:C1AF36956B57ED3882C02D57CFC7F543EF4D01CB58C3B98C06380D76659A3A1D; SizeAsReceived:7590; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 23:33:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:31:52 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [mVdW+VBdJZISMwwtjCOJLB1oadPB9W2b] X-ClientProxiedBy: PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210615233243.1173928-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Tue, 15 Jun 2021 23:33:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e770be36-93d0-48b8-e969-08d93055eb3e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk92w3tzm64AvbWP5CJtYQNbKsxgxpBTv44W4kbyxV/OBppUk9FDzgjrebL5XK5UDDxjqHdjyKldGVCJEfrAx8OZVukBLkH8uV1SnzhFAwcjhMUOM7c6aTOLkijfRgGmHprOzMvryCKKQQROn2R1dJKmVuH2Ya0OUyxb/UZD3bgnJIhPQb4+LXZoR/RKnelMfd4oI4c71Er+Z8Q15+LEy7rE4GirNHGiPwOvtEzqbTAC411xPk7xGg6fUG/arlujxQSERLBH84qJG1Jofr3bqXJnOj8oJiqFMzsZf/+84sdy8Ee6GYE1ZUJz+EccErZuVIu2Efi730TT4UCKODGF13ujU7F7RUknbok/bYhpOm60nC/eKcbS3Xi8r0hJUvm+ojp/qLdLnvtbiCpy2rtvxqmrjXOuoag4QwmzyFCplgKeMiMp7t/jRb82Oh06Ea79QCzRQ+e1Ki/9jboI/0jnPwHUJkKRwJbcVnbOaimelOU1NfBEAEnAQfqIF2Jm6dDvxIhV/KEde9pqCe1kHQnspU8I8YTehGUcY8BdryNonjwnrdy4wbhHxjpFo1wtL7oU5ZkY1H3SynqEMmAt1esUdR0u3RzwAsvqiDzvkT8RfrurJmbzjpZnDk9oyCTZrkvHXRSanL0zFLVthH4F1iYQme+GB2WJVPwMTt96C9dvQQ/8iFm7Y4NFLNdnBLi8AiJu3X1SxkLzkHZY6lRhPT1XFHR/LqrO3S7OxJQ= X-MS-TrafficTypeDiagnostic: DB8EUR05HT113: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q3+sP+oq83BZw+rjiwKykKaOhKlJdowj2p13/zlW3gr+2/NbDz+JAC7KjGieVhHdlstnMi6OwX42dj1aG5jWmp4ENOnGd9WWxC8W8v+PGx70tP3oGkOmV9zXyILJzr603iQHahkiYt9b48OSY4j+yGtwypdvH+LiAE7c+IsUiLTrdcanNcB8U5hPH7ZR8I+hBToldNwxul876O+cbEu5sCJJIDwevTwuTM1MizvVvw2OONVBcszrdkjZHjH3fZbt0GEbxuQFtjjLiiVfkP0Us5jyoDRp7BzsuYOKDCJncqqCZOHwte/hnqZrPV1LW80uGslz1R+95qwO5JYdJHMkREp77mzFQA8yrvaQ3ANycG4OlVoSSCE34ISvV9o1Vdr1AmHY712GFt0c1PWmsvQxPw== X-MS-Exchange-AntiSpam-MessageData: R4DaF1lE9YEg3VqJv1Sv/OhEiKKCpy8otwyraFiXIeeslNK5GLBFtxvce/QHmBr/j4jK+MRdbNcqR/DYZc2tiwC88yq4Uh+3QrJJcpIqF3OlOmSQlcNHTRoBtMbiYvtR9L8lZdpchtWWRN3M77/Ydg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e770be36-93d0-48b8-e969-08d93055eb3e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:02.9546 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT045.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR05HT113 Subject: [FFmpeg-devel] [PATCH 03/54] avformat/4xm: Simplify cleanup after read_header failure 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: xRittAx3KAmt by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/4xm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 427eaaddd0..f918b1fc57 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -283,7 +283,6 @@ static int fourxm_read_header(AVFormatContext *s) return 0; fail: - av_freep(&fourxm->tracks); av_free(header); return ret; } @@ -397,6 +396,7 @@ const AVInputFormat ff_fourxm_demuxer = { .name = "4xm", .long_name = NULL_IF_CONFIG_SMALL("4X Technologies"), .priv_data_size = sizeof(FourxmDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = fourxm_probe, .read_header = fourxm_read_header, .read_packet = fourxm_read_packet,