From patchwork Tue Jun 15 23:32:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28408 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp126091ybk; Tue, 15 Jun 2021 16:39:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgD8Bv2JRLoqRYRxjbEJH8UWY2581SSEWgBtI4Hjw1JwDRyUPdjedNYGBV2AkldPdxHpb2 X-Received: by 2002:a50:ec97:: with SMTP id e23mr256364edr.278.1623800362283; Tue, 15 Jun 2021 16:39:22 -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 d7si478224ejo.445.2021.06.15.16.39.21; Tue, 15 Jun 2021 16:39:22 -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=OU3Wwc4z; 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 4D34E68A091; Wed, 16 Jun 2021 02:34:44 +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-db8eur05olkn2041.outbound.protection.outlook.com [40.92.89.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77D5D689E93 for ; Wed, 16 Jun 2021 02:34:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b212Oqgq4BZTCrdEP5VFjgKf+Hc0FfqlDO2Feii1QCuCVSSD+9Jz2HZYXHC8WnXzgpCByW/qIpDOcF1Jitylua04ZxWhcHjwHZWokISNae6Vo115kwtAOjEqof7SLjuSMJ+3wnId8FH9zxDr7Ac7qzjzzTua1llcD+wFL7fA/0zL2PwSSdlZ3Wgr36O25TM9NFyd4P1RzmSV18hq8Q9Be/DVy1ztFS5EIqE9F6fykFXuELlPzdMMCyY6Z+QhkjboMzeDO0qJVs2As6hWM8SbirqH6lTDg4pK2yt3k68kh2rrmLogwGbzeXZ6lF2LjUfbHG+mYS1PXWainTbheHkjNw== 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=XuhJuNDwySQs1WO8ozHvov9EZ6VIyqMWXF5835pQDIU=; b=KBO5QX37DLLhGPsA6wc5bItOSFNEgozd69zAj3pjBS3tei/1f15b2fRy4V+oHQ3LDbkVUlnGxzrjYJnpHR0CppXpACSj23CS8bHxoDGlo7iiAFXo0xR0f1z9Bj6o0VKapl73W1/ZOUKLUctUpLjID+P2uIh5jb4sdSPjKkMuvhOQytZoQwnMcqPwtG/TK3BPnhsX+JtS9fJMaBRYGVedCaPMLG5SBgLKrHZ9wFBKFIC5KYlNIUlRPmtYfJeudw8dnfdsAUEh/N7a3jJSrLBFTk3fqGsQs9fD7uLs2d986W7VGVRhxhEeXMd3Mo5omzET0uy6JSnM/G/s/PXLsPIJjA== 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=XuhJuNDwySQs1WO8ozHvov9EZ6VIyqMWXF5835pQDIU=; b=OU3Wwc4ziQ/FCrlSCB74/mvZXSH+/+Bx5kpZuMHvFCxfFKJpQuQ+X3lJLBWzbD1NkuwY2m9nFwdnvWpkS3BRXSDPQbpQ+1dUPJT1QmfuSlDJzTyC2ar223RtRsw7ppDQR2m8OZQuYRZs32vaQN/pyKfKfxM5f3/aMdMKvbHow3u8Q+gopjxNZBRbqTT5+TXvZlAzL7em/IUYRQ1geEGQHch+UNmiCpPWOVtovUo+oPxHEHNJn8OZRlPHIAkMIKbSCXUs9O/8ql1TINjoQHrxaifIPkAdJTrdborG1cwog9qxUmInZa/jQa81RQjwnYQSyOe3BWcPL3Y3F9u1+SsEJw== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::44) by DB8EUR05HT022.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::121) 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:34:36 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::45) by DB8EUR05FT027.mail.protection.outlook.com (2a01:111:e400:fc0f::448) 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:34:36 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:316A32BF3FDA456256028B589E919AC22B38870BCC1A7CE0E51E582E675168B3; UpperCasedChecksum:89BFBBC1AA35B312FC6F8D47713A14BDE1AD703C4102555E6FD0BF341C160A70; SizeAsReceived:7772; Count:50 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:34:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [GI9QngLa4x+yrTv21UpA7Cofkh9+weuu] 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-41-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:34:13 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 683bb136-9e2c-4ba9-4d75-08d9305615dd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n54hrFV+Pl7Tba/5V6DR7cwBLhtherAoIKYfmkvTmWc+N7UvyO8hMDxmsiJCXbZ23scRenIRT68/bDZVHpd1I6LoIzz8KgyLNyVyanEVbfa+OGxY9z+OYCsc/Z4IJlTa2LVzQG6I7HUUcClgryobv9Y3yFrnCTfFZbhsikzYWxDaQGNCmLUz4yi5WYitujB00Y96iONltZag35KXf1nWcGngDkj+ihAuo00PZcVQHRahjHHmya0W3PaHVXDl70+QaCq0x3pzan8mTG4Geyl5PuV+mjnqkWT6dwEYG7JD7p9+hiXfxA0ttd3v8trP/uGWmuKttGNFI6rcVOY3zH9pnWc0lsG0Dhocv9WTUsb6BylCLzt7y1aPdQYWirfyrleB3AoNN003BbtO6g8jLVbQsvINSz4ECkbreKQTuT8lmg0xfsuTSEU2blKJnvXPKC4eI0Vb8XgjHYoRAVXp9HaPvGFBKeoq9VcgY9xV2yx+usNhpyXIGmqONV31Ms2xyHMa3VRtTcy+Xs+w2bbPq22iF6WZdTHAkQ0rGySoNzOho/SMu0FKAb6LxlPDiKCMEYjoRrE/Y2WLCzIhtlPDWDCrlOZGepm+Zwuxqgfj4OB3oTmwF2Hc9l69oIBXQ1nFxP2fskYJRfujdkztAmnkjjCNuAcJ0ryMc5Q9vNgw5fYxhUZoTitD1eYSWu/K3RC7m1NxnEpC2NQDrngpm99wwdu30AmHegOB9/JAoc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT022: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kaTPPFBsJxuMOSk93ImqvzUXH2hxQo5v/+Qb2HRVMo1RDdC73Vyk2RG8d9htNgUKz4EzdiG6JCVHL4eMt65zMMoKLkytZEdvGSxgb56IXvdqugJA13/D75NwFjXtZMhMxYQrs5ju/Yhpld6WtXk9GsPvHgaWYlUyGwKb+LShZh4y7ZWj4BZOD9/9DwWziMi8DPnk8rrCmMPWMm3R5atQrrTLQMdpqqdcFgv/0I3blocywxWBNHOY+Vj0WXUcZ1vH8nhyqLtsKlcfOeLIMgLh/SIvVUFJRnhhzO+9kdRS2hK73pvvBBgut6AEhZQIOL42rX7Y8zIvZQorxIl/qxzBXlf2PCqn5xmpvNcE2ZBxaqnEcrRlVlGaS3OqN10WfoeZBISc0cPbK8MDr87Lpa2G+w== X-MS-Exchange-AntiSpam-MessageData: KESNIe6rHOrIZYFTBhA0NE+tfc6sqKR/0CwZ5SUeWSbZIlE7kijJh62KXrRvkw6qX5fSH5ppmrfe0bM4Lz8chSBiJ/PUx7C4hIB8yvyoh2sWR1iM4xaG7ri7E8K3iArpuFVB5yc4k/1GZFJ4lzuSrg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 683bb136-9e2c-4ba9-4d75-08d9305615dd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:14.4520 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT027.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: DB8EUR05HT022 Subject: [FFmpeg-devel] [PATCH 42/54] avformat/sierravmd: 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: bzpTuNViXHLx Content-Length: 1294 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/sierravmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 13304b0596..e35faae50d 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -252,16 +252,13 @@ static int vmd_read_header(AVFormatContext *s) } } - av_free(raw_frame_table); vmd->current_frame = 0; vmd->frame_count = total_frames; - return 0; - + ret = 0; error: av_freep(&raw_frame_table); - av_freep(&vmd->frame_table); return ret; } @@ -321,6 +318,7 @@ const AVInputFormat ff_vmd_demuxer = { .name = "vmd", .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD"), .priv_data_size = sizeof(VmdDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = vmd_probe, .read_header = vmd_read_header, .read_packet = vmd_read_packet,