From patchwork Tue Jun 15 23:32:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4312180iol; Tue, 15 Jun 2021 16:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0csYM25qz1mLoo5VkekoPexDvPjKn0xdHjdZgDkw9Oyfd26luQBH1dByMoAcpA1Fvzw7M X-Received: by 2002:a05:6402:520c:: with SMTP id s12mr709023edd.304.1623800179031; Tue, 15 Jun 2021 16:36:19 -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 ca23si284831edb.573.2021.06.15.16.36.18; Tue, 15 Jun 2021 16:36:19 -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=FQkrn+Bn; 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 E6322689C64; Wed, 16 Jun 2021 02:33:36 +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-db8eur05olkn2030.outbound.protection.outlook.com [40.92.89.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44646689A4E for ; Wed, 16 Jun 2021 02:33:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X29hEe5e7Em9K4JLfJKVDTefbO6NRocMGhRLdygvPNINzpavAO/wt0negOPUUt3H1jraPI+gN9Oz1nrFgqIheI1C/r8Z2ctQyVZNHFzQeV/02Lq81jnQ+735d9iBYc0t1Dk8A5QEvNxIyw5T6ydiGDycJFtTS5sxj2F/4YhCieK/zFus651a0Sg7cmm9vIpj1Gaw5Cq/iM1rSRcXzw6ip+CRgfeFmcBgPkNXDXkuX8LqdXERpWdgKSLeMxJTSlwv7OOmfcX/UBXVFAxORKsZTIYm30lD7KQSfPqLmkkW+a2tAhW5/Q7S8nUyAjCIdLX8iXU1YI4rdzAOyeIeCSAyZA== 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=FTRTl7nQc8U8ud1fjdGtZhg/VASqrol/AyTiPWf+3UQ=; b=L/iB2wqzRfrjdyWHSJPdMt3yplAWZVVcDDw6jveyTxlVWS0zwdrlXk4CSUOx3y3gb649Yfh1H/kxdtp0IXDYq2qBvqWIS1L8Gq9vtJZbwY3X3NaCMKOBpofUC2XlWleFxdvSFjZ2xyf3AY/okWX9JN6q+sPxUziBcxgQbkYXsNiwU66zewDfwEVK+pNpy4Wz6o84/IpzVsiQGqwGfacrn05pOL+Ir49SnCOmBtvJKyWsVSE8+oYxGWf6K8VrmfUGD7Jhc7x/FJi+gPOeT9vqjixVXTMKrCYgJWA2UGsUM9mHDXNqgLw++nn+/sbRiFa2UwvnlpQf8wJntth1zIfcmg== 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=FTRTl7nQc8U8ud1fjdGtZhg/VASqrol/AyTiPWf+3UQ=; b=FQkrn+Bn/FoNSnTCo/U2WQR5i1r36P8s6chv+ar3n1L8u6sLK5gwx7crgCFnTeXMzvU/OfkMVMep3XdDo9wEfg6ADALO1G3UfK1jZVf18PEKlS255SjMdhaAyqFG5UPVM36PxSXXlWfnpGK/Dwjk7UArt7wpuQCEV1HZBHwdyW3CvrhqBa2GoLMx08UkUbIiz285d/dxWQNUh9MrXuUrDO48EKfoggdN1gQZU7Q5CyMrUE4njaSkvVxbGDVPYpoTs4nB/2QQH+cCNYzi60fKXy8B72iXQgQoShVvOmz+xieGeNKDpaGLroE/QSdw8G/5MCz41oFAZEWFj/x1zsq1QA== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::52) by DB8EUR05HT163.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::472) 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:32 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT030.mail.protection.outlook.com (2a01:111:e400:fc0f::228) 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:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DE79879E1064C2AF8A5D2241E3BD71F9871E72C71D3113B3DE605AD0EFBF2007; UpperCasedChecksum:51EECDB344B47F9043697BCA016A280C107613CF3F92BCAF5001C743DAA7E850; SizeAsReceived:7594; 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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [/950BO79dhvM+D79OXYHEATqZ5ATTcwp] 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-21-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:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b51a9f89-6915-4b52-bb8e-08d93055fc78 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjES5i7NcTDYEwSrIFD5q18l6MMZpVzRwr73uWay+0YiWGMkxB/DTecem1UkxAbit7TWepaWvNrG8hvA008If7YgD2nqIuYsmnRK3e8koIduMjZ71Ywx7XyOif6orBTIWzupWyERMA789ZagYTb/C+reSaPkvM2tkVbMgwr4vsltDDxeNcicfmg6o18TkIzQpqC5nHmRd8S51dTiQ+WznQO26FiahLJnGrSAMHj4Oatxy5SwwTdxpVkVT+Wf/gOj4N0Aa4HHJjTtx1MaAGgqpehQshXz6ZpUouPzSGoC/5OA5kHVQzhgCAjYGUdLwRLcMLVGp09Py5gdEBEXkpJ6cJPsCkOyV6/xYBnlRr5zh9WESsyP80m9uuI8uI9iJB2rDO1rgIkvsdI98JuUNSSPCD52gd/gJwq/qLmQlkciLVJhFwNASjej8AqqoO+gmhfAq/wQpvUphvuNp7SdJCM20hlWLrIkwUaG7Gvk4ZyzDYogpVKRPk/KzkHm3Lwos0uuExnDnQiV0emooBW0q2Gy1rsKDdlA4WceOw+3Qxc6Am0pfsxLa9FedsZEJITyPuVLMoTJkwwQxpMiKtWoibUYZFh9Lf/+o2ByvHdUamNuOjSLpuKsWGQiduFV3kEF8SOlg6Cw3fTJXsadCGZ/01vmYxthqHYC3yV5FpVqRMmUtm5ZRK1aGaEpJXOBdDv0LXgLPL9VdjUD4JA/LOUTl44x68fU= X-MS-TrafficTypeDiagnostic: DB8EUR05HT163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FIB/LLcxW2xVSmiO+Jtuq50/0yAn4PUvXaCBpVWUgNZgbpVkcedj3rkjK9hfK912TUWjIG3yIiJAySwUXnr/9ydbALffNWYC2DKGOU4ZduXdJeeg3cHrjuhibt9AxdhMSvH0usnAdGuIIkIZZJGfdKTIbb+HBPTuWHJNXPoDPbYvl55fiyZiPZWoxQq2qfg6j92sHiMW9kpj70ET9E3urlBU0EudKZs7oD6i9zQfugcZBMuogLXiqGjQJrJ3cMfKzUCEMe9yqS4C3LyqU5057WqVd0WojGGlGW+XsAOoYUF36PKWCpbgFb6AESep2SPrJp5CTukBgh5FeIZ1bUcvlKNSXq/2SazJT+U4jCSnBiPSKWGokL8l7TxPvnWZ/NuprAZmUMD2WiMNonTzTnE0GQ== X-MS-Exchange-AntiSpam-MessageData: w8KiAfBHliGFJK5BhFiX/vTmApFJRw3J/ev2cMtOC/qBZqPkW8C6eeClYbcwRnemHCmjdB4FWr4+4XAYRkjDZnE19HCunySVoX9CPEZ9896GvZC85Llh0h6SHHIGj59OWLwHithIF7UWkPwow3ofIw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b51a9f89-6915-4b52-bb8e-08d93055fc78 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:31.9648 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT030.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: DB8EUR05HT163 Subject: [FFmpeg-devel] [PATCH 22/54] avformat/mccdec: 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: LZCcvz3tPnQy by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/mccdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/mccdec.c b/libavformat/mccdec.c index a096ac6e93..d206fc2d62 100644 --- a/libavformat/mccdec.c +++ b/libavformat/mccdec.c @@ -189,7 +189,7 @@ static int mcc_read_header(AVFormatContext *s) continue; sub = ff_subtitles_queue_insert(&mcc->q, out + start, count, 0); if (!sub) - goto fail; + return AVERROR(ENOMEM); sub->pos = pos; sub->pts = ts; @@ -199,9 +199,6 @@ static int mcc_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &mcc->q); return ret; -fail: - ff_subtitles_queue_clean(&mcc->q); - return AVERROR(ENOMEM); } static int mcc_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -229,6 +226,7 @@ const AVInputFormat ff_mcc_demuxer = { .name = "mcc", .long_name = NULL_IF_CONFIG_SMALL("MacCaption"), .priv_data_size = sizeof(MCCContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mcc_probe, .read_header = mcc_read_header, .read_packet = mcc_read_packet,