From patchwork Tue Jun 15 23:32:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4312681iol; Tue, 15 Jun 2021 16:37:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF/SZCCfzorpUldU303DITd0kwaJYfQ0jBwyaJ4GmHMDTC4+2SZXLFDCrtwprCXrHvApoW X-Received: by 2002:a05:6402:3117:: with SMTP id dc23mr726117edb.246.1623800225891; Tue, 15 Jun 2021 16:37:05 -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 ba10si254275edb.344.2021.06.15.16.37.05; Tue, 15 Jun 2021 16:37:05 -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=uQCX5xEX; 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 D3697689D48; Wed, 16 Jun 2021 02:33:50 +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-db8eur05olkn2031.outbound.protection.outlook.com [40.92.89.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66BC7689B43 for ; Wed, 16 Jun 2021 02:33:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kht0raIlMCd35vS+VzC3p/TtCpVb3xvGsGzRSIhIgQ27QECGrxmCExbm2sOfmnnVEr7fqz3xvafIa9VgD+bd5tT2lo9qZDVX8xC+zNe+kRpI33J9Z1w/aetQ/JvPcDnSolcEPz3Lq+j6KIHgYg6Da2Mmm7ZDB8+WvrK4A7NzieMHIUs4Z6cBaE/+LNnibVhxLu9RYwEeOpIoVfrMNlYA9wXL17opqSR+RJa8NP6q76UUrA3TcIAiPAwFfVina39rdQaMdEaIRLQDXFQBt69KVT9cXeUap/XvZySpMijvpK816jdSxUTqriTktk6DqMcHGvZbPSODeJL6xTZCkCVirw== 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=vtqKGTTjpUExnXhbxB9X7QbzMtTbuIOE4Rbayr5cSWY=; b=iRYRCe6YXWxR+zwjyAkPP9KLqUy8Aq9K8M2vUlUs+sWfwMagiWUmCm49h45kSldlU0EKLwqanXxF4sTli3QLfb4XbliQflzD5+5O3aE083bqIxX8k4x+OzduMf8fHFCu75pjQj4JRinkXEfqnj2ptdCB3CDB9v4s6TtiVcKHBk/U4oLApSYPE23dC2pgtdphP9X9ZiQkizmK6982iDYQhkazbsibjJ+E2xGVY1R2QivLCE7D5dz4poUIUWsWXjAxwo9IVpVbIjCofa+HL8aII78dcWTBG0W9zgfnGymUHH7HF0+cFT7AGnR7u1VQr2Y+cpgQ12KC8TIG4EbSCLcMBQ== 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=vtqKGTTjpUExnXhbxB9X7QbzMtTbuIOE4Rbayr5cSWY=; b=uQCX5xEX22+0ujFu+A+BW5HVk2V0E0eAcNZCBIficI+7NPKPTWZr7CZcXUT8kojrU1lHtuFnJGPa+TRhwTCuJ3vcYO1HLk/LVYAhwvq/yBBNbTkVu50w+4u1/UZWFas25E661hSrF3mPeX0kixl0dH5UROeCkOiHZpNQN+7zl1iYlorxvhhSFAV/Qd5BlcDWPQbBDu9WYeY0wlUpSasUoeeKiPKoHMRdTY7Ux6AR4PwOWzPxC0sWpCYO+86ZYJRLp4TUZu+tzbXfXQ3L8OVhF2C3i8qHqvyxzmOMddUsKLNjl26y1ekHi0VvRqct2ChXYNRDRJgIxFgwMR8uav+4rQ== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4b) by DB8EUR05HT099.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::244) 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:47 +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:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5A3AA1F90FD41DCC6576E7AECEC6D1FD4384BE7E1A78D0F857BB6C087004B70B; UpperCasedChecksum:2122CB26F9A23B56B35DE17E3E3EB00282B27F079754E69D7E6BD08C5CFF36CC; SizeAsReceived:7595; 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:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:16 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [6ZuXaa61tzmMGdPs+SRdYN3yVKR2mgXx] 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-26-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:47 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 261934b6-eacb-4314-0fe6-08d9305605e6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n7LELivV0hd92NH5vMhw8akfR5pzPkkTHXoE8SMoBVH7uUCbVezTyVCzeVrwvjRM1gRNAl/gEJVLkAY+jvfJXORKgicT/KuircKDZCfL/m1rK39eZrieszFctiSI8ZpR4TxmcMePxxyZztUbQQzFXz61FQQzUSaqHacFe8ZqEX+qSPyjSxUuao35LfuST4M5eFzQXwmzAXNePSpZ8zZhAvP7Eoci++hlw6spsevc2Pa3BJNqKaHTr1g2cgxHEXG/hYbvvRc1wO8RJqXUYBsgbgabT8Ww29CcH1+l129MgoF4RytzTwLx4AJoKNafmIqEHAg3zV3wbng4EI6Tc1uOMva0dKyZznI85rYgZg1VOlL7pR/2muhPWWSg4ILUcFSwbVyRXa+tC3snSi4xuWzYR2ssdumfA+fWTyh5VklVj36hxZwWpbXehk9XqL1OVBcX5GBz7PGtSabT61Rg7wqw/Njaiglzz6a7AcQTDiIp4qRCNcoPjBAVLKcih1cycrEHPpgjJvPQ2GkkS5CZDpVcgnASSDgzT8yjGnpQwjvHk1bTDJ3sD93HoVJjdziqfUhAFfQqGaBUi5zR2wETJjcgONYaZuI6JGjk+FHWLVftg2lLibN65GPdg55rhduF90PbWUVEMjP7jUCNxVZo3ao+SdLjfWhyciRjYoGWHH0dGQKlMPNuN7kAQQiLIXSMhTMaDStE7P0v3d+8iTPCOLVY3L/rfp95BzysLc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT099: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3T9iUI9SdGtOj2hGp1zDe5+w471rT5sntdkSWx/njMnZWnKMl2QUQXXEMu7jwwwy0GgknMueA0SQwWEWICtLPBQRlowfICDXCz1L5vdaMaaCNjk+luiWyWWaH/fIHI28KFDZP0dA/2sujNfjKO1ZLXMWdZpk8X6bybvAdfu7PG3f8xCb6zWjtB55Xn/rBis7mhdi2jJaQdmNBp+hUoItrAPiRxKCDGIeRNp+zjUXL/C2vHsXzu7dTKS/n5gd/wzfpQYduDd5pv7iJ89r4+eH/jBVNRqf/tcZb7w3gwA2paahB6L4/KLdCJ58nhFupy1+2UpFhiJyxlgK5s7Yth8zteejJsDGvAH7S6g1+AyIEVr75fIHrLN9Y353xQF3Js8wEYVQuQp0vXU9qltuaZoiHA== X-MS-Exchange-AntiSpam-MessageData: Tlw7cLHkFbLbdcA2vgFjgfI+fvB55+SzQGPOnOCN8tofEbQAoEIuYygOIT7s4ht6zVvX2C6VWCZum2f+LJjLyx5k4I32H5U4wc8O52hp2QxttQZITtXWlldfNzPdqcRCx6LBV/ASszGLY9ae0rpE8w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 261934b6-eacb-4314-0fe6-08d9305605e6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:47.6568 (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: DB8EUR05HT099 Subject: [FFmpeg-devel] [PATCH 27/54] avformat/mpl2dec: 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: UtIjoggr+N0S by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/mpl2dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index b99acff157..0beb9ca388 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -110,10 +110,8 @@ static int mpl2_read_header(AVFormatContext *s) AVPacket *sub; sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0); - if (!sub) { - ff_subtitles_queue_clean(&mpl2->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = duration; @@ -149,6 +147,7 @@ const AVInputFormat ff_mpl2_demuxer = { .name = "mpl2", .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitles"), .priv_data_size = sizeof(MPL2Context), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mpl2_probe, .read_header = mpl2_read_header, .read_packet = mpl2_read_packet,