From patchwork Tue Jun 15 23:32:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4314761iol; Tue, 15 Jun 2021 16:40:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB/FvdQMcnaE1tzgx00+tX5YA8tl7vyuLJgzb1iXox3QQHwZhkmQZXgkUMHSNhDdTgW0Ie X-Received: by 2002:a17:906:8056:: with SMTP id x22mr2044074ejw.298.1623800433794; Tue, 15 Jun 2021 16:40:33 -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 a7si273210edy.476.2021.06.15.16.40.33; Tue, 15 Jun 2021 16:40:33 -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=FODnR4OW; 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 8EAA168A148; Wed, 16 Jun 2021 02:34:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2106.outbound.protection.outlook.com [40.92.90.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC6F568A05D for ; Wed, 16 Jun 2021 02:34:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixauRdboQjzyr+aOfCunios9KRVd/UfDSka0SO3/CYnvY6OGeo1caGmnN1L3woplKXX/nrfLaKECFdRzvOQ5Qsf8MFRZdr3h28UihTPZ0iJ2jSaTpsTWUjVBY3ofajCDyztt0l6BFjNXmDEeBbyTpwq8GthwRHeQxm7/G/eB1MfiaoAzXkPfBi7waJQnFi2W1ARtcF+Pnkg4EMrkHGdZR1atddWWOnL3lrjsDDmJJSRcg2O6O+V1WYrCzrYmNPD3+n39TDrKZ9/Fe4Mzjz4fjG17PS76Z7E/qo3YBxoRf85mWPOdlZQOokaDSDQg630amdmYfOjcQ+/uUlYRxewBmQ== 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=fpu3a4LxJvFSZ7LnsAP8mDL7t8e/gmNjOqbi5SD6Pss=; b=DRtQ8ETZXnyIw/dr1mo9bhlLXhaFM5q9o2JGE/1N+mu1szQreAb8yL91r6E0vn7ywklI08JC6BMADsb0Xox2DLe0k8IKOMpkED7o2Yclo2MNWWyye7rybwHaHYkCH/XtgmjFnL78qasi0Cge2lE9487OfhbADl/PyNO9vfAJn7zalC+U76QEHYfkwTWm6RoUDeLUHAlqnKdcpiht/AN5sek/C8nf6HQ7tfyjvRtUlC9aAUQ6JsGn1RcF/AUnsex//kChziXvJ0XetOHI3wUexmIUJgCib/4casBO014nch3r/EQitm/T6xvJklbI7zIKgl3o6Dc60hBmPs4xi3R7Zg== 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=fpu3a4LxJvFSZ7LnsAP8mDL7t8e/gmNjOqbi5SD6Pss=; b=FODnR4OWbckZ/vo25C4HtDRpx2SuDLLnHVZLZVuTS+jdMjcBfTNNbZFV5tRLcsUqKJnVfMk0tJkjllhUb8Ef/FWKgfPHslZrYNFJ3aC0z/4MQb6B89FDHm35L1rgIXuBvIMoCFx9+VUsTMiiIhGSPtISWUDa2pRjSBiT/tRaJ6CO8aIhI8pzJOAJ+ELoDBj7Z7PvEUjwaDjINQ48cvxNxh1C8f70ldMZbRPPoDQRWxXlccUcA2EGNoyIU9/D1qwbZxoz7xak3hSJfeQ8xqmdsN0esfVzurmo7fQ9Gfb7x0KSps9R+N/ndHuYSXtbkRx+Blnmh1YjrYfeLrxRXOCcLw== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4c) by DB8EUR05HT116.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::185) 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:39 +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:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3E2E2C88DBF5BFB16C87FBF06E2D1AC37B70BCCFE0B22EEB99102C4DA9E096B4; UpperCasedChecksum:F25FED56E955FBF944137E6EBDE8C2FB4DFB7D0C25E51A20659EC74ECB089049; SizeAsReceived:7769; 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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:39 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [XEJJX6mqSLjXNTcJNR73HDo41lm9/KOo] 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-49-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:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 206211f8-af34-455f-8186-08d930561f09 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n5rcr7rK2HtEi6ZBerjIlOInM/x0oiX6avqH2vGm/+WmM86/OYOSB6NQn31VY5/4dpe3+Jyz7DWcz7oEME4YW4ZxX244Aao86P5bF8r/r6D/mksljtXZibpku1Q+B857fMRoTq0cLH6n9lmT9aOP07E/BcISrjy8Xd3uNItF2KeflX5wpuEoUebQQBxQGY6hndbybLRIRbhB4vYhaBzcCMVKtkxwWLorPQXJSJRrBsUx+6kxmyLLOmhU2kCv+GXaie+AIGrzSrc8Djaq+7LSaXLdncWGIVNXf8dvUgwZmBDRxPD6onsWDvSzFtlkpTR4UyzfYR2cHuVGy00tRDHjmUHGHdVaRgG5wu+t9aqQ4wHbxBH99twM7LPMfz+0CcowazMj81AwJp6vjbtMo6vjjnGYjrPQPbkFGfvG+ROn2qurqZKBoKEWj4PudBQHbuFNrtMeA7lukTDOhWFIzpr14L5UYZoPIydtIlUSJovBcz13h4FoEUIYJufTTYgxvwGN41+TZhJ2HGZAshWGOhhqTk91KtBjrVbZpR8dAbjSq8AxIX/8A6Ph4TnV1UzbKnrIjUdu27eCXoIyNA+XT/3kz8lsSejVaH/amHo98qNz0cQcMpRy8VtkcUGEtnBZ/VMv9OCCakFIsk89m50pT7ADhTwpA7PSdWrc1z6uDKmiplIL2OUdFNkmtNX8FTnCjVdeo9Azowf0U/c/IuVdDAf1mfAyrAs1IDXm5o= X-MS-TrafficTypeDiagnostic: DB8EUR05HT116: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tEqL8Hziu9b4C5/qcOf2mJGNnJJhkRlVjcuZ0U2LRZHRh66ZdPNfsY0l3Jiq78F2ODu/ZjCOShpvsO9EkLuSmvXAcCWrLqwI7mDaP6oAoX5ZYrBzcs37NDv7+WteEgpFi89HosVf0hRo6T0MTmtLBkE3NXxcxgVR10eU+6FZaCRsOZfu2nnAOHAtDj/H57uRCz/lHeByl8y25oMmLXojAizXgT2X/otGcoXsLurNJ5F4BVqqXXNIgg6O7K5jJzLuVB2hzMI5bDBxI9yB2t9bXMDChk5SHE44s1mVrbXr3oLoW0oA+akgKDJFX3MIklxeiKMTnR3DF9uFVMXjb/7p16LA1+O2c1X0Tlf2UlKsmuUy9QejnYZqozWNM1zAgEdEGdi02pOpWjR+lsQFmbKzNg== X-MS-Exchange-AntiSpam-MessageData: Z6A/q9jJ6a6rWz8ex4F0XPBKJh8BPLN1xbJ2EIuz0HtKrdkTlfmPcuCu7n8ye44yMAhXRbb9d+PC9g/u88XDt6FL4avkAmqDQuPEU5aDbSsKjUJd+TLXhMMQzH0AZo0PGIQOp7DRPb6MiPq6B0wpww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 206211f8-af34-455f-8186-08d930561f09 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:29.8811 (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: DB8EUR05HT116 Subject: [FFmpeg-devel] [PATCH 50/54] avformat/vividas: 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: s+sB4m5zs5vM by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/vividas.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index a7deab0e51..8d1c1dab29 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -613,7 +613,7 @@ static int viv_read_header(AVFormatContext *s) ret = track_index(viv, s, buf, v); av_free(buf); if (ret < 0) - goto fail; + return ret; viv->sb_offset = avio_tell(pb); if (viv->n_sb_blocks > 0) { @@ -624,9 +624,6 @@ static int viv_read_header(AVFormatContext *s) } return 0; -fail: - av_freep(&viv->sb_blocks); - return ret; } static int viv_read_packet(AVFormatContext *s, @@ -785,6 +782,7 @@ const AVInputFormat ff_vividas_demuxer = { .name = "vividas", .long_name = NULL_IF_CONFIG_SMALL("Vividas VIV"), .priv_data_size = sizeof(VividasDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = viv_probe, .read_header = viv_read_header, .read_packet = viv_read_packet,