From patchwork Tue Jun 15 23:32:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28371 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp126281ybk; Tue, 15 Jun 2021 16:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt+hmjlkIpOgCkvJylUf+ZQkRF8qsrxZ9ExXv7BKUfPqFJjjj7h66DqScVqv+ftlUYU5Lo X-Received: by 2002:aa7:d5c6:: with SMTP id d6mr701311eds.290.1623800381464; Tue, 15 Jun 2021 16:39:41 -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 16si393065ejd.349.2021.06.15.16.39.41; Tue, 15 Jun 2021 16:39:41 -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="WJe/1LU8"; 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 16B0C689985; Wed, 16 Jun 2021 02:34:46 +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-vi1eur05olkn2099.outbound.protection.outlook.com [40.92.90.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D517689F4F for ; Wed, 16 Jun 2021 02:34:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MAkkWxf5Kc1PosppEzCW1KPFwFdEXTbKHCEX9zCR0E3v8jLYvPxBMj7Ht73KeF1wTnYfXRdT6gtkot63hRqhgeWXR4wGehtxuUHh2CES/tjFSfL6ex5tZMUh39hjDynYnwBwCLa/+U+rkb1sjPqZNB9YQHjR882B1g+gFzwCmOa1vOQlL/vc03+vI2mlLkF1kdMBDSU3VszxldAVxdptbx6fccarVu89+RgXpDLu4/nx6YgYbkZ8ZpJ+2PtXKorp9xfR15SyxCt30vqaANv38+zj2LvY74Q4STPyMwd96sfIZKr1i+SLCnDulLSpRvAX6BIN+O1+19QZQn7CnVlBVQ== 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=OCmoiCe1JhEnyAd7CK1dSSMlnSdEfFWhLnVIPL8M6/M=; b=jI8M84TSpVZi9QWR0EGJkKj+wv/VsAQi+Wr5u2+rO22ltWF9qWQvt/ctvow+bNHLx1xby8Zs5+W2IczzfQsrZPQfNNuN0KnZWIKn/g8XKaXarCyhAjYIvCs1oDTz1XT6VwcI74KZyQVQWi2tE7/qvwyLl9qwG6J1RiERzEqg9ljpn5yvGMZ+k4pDZwFygMZq1hg6ZgfFVLAjiP1HkUIqGlKJo5WPVUrCsurK3iiMi7JmxfcO7vVRygjtw8T2KxlUylI9xZHCIOPLoN0XAiHcwjo/b4VG8XIGnzyForGepxpCrkvPs0IkPqeGCm0O/RrmEqAT7ewiwqrTDgjci4hj0g== 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=OCmoiCe1JhEnyAd7CK1dSSMlnSdEfFWhLnVIPL8M6/M=; b=WJe/1LU8LotUwLwqcmjKqNjcp/d/h0ol6gG59Dh8V+/ZgxB+ZP8Vonndz+xqftmiLR4oGitH5uLvT7N7uYIiz8YA5w2nhYnzZplfSkeKqEtbbFyqrxdvQJbNpcfmLFtgoG19R44qRv+4E1l/Gu2R/QMaYTwXDUk2IHVvpCI0h8h7v+HJnKME1+5AnuAUaUq5UxCE3x1I1LMq9e1d834yP/vuzuA3c+twhKyXIsDFcVq9fhktVTaR3wy8l+qXLewTeYVtzFOFRcgTbputTHGf83aNt6VE5PrBCwahuJH8iOKuAoBTPzJwL0Xehyov2v6p5I0H0MTU2Nw/QX2WpF+Pvg== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::45) by DB8EUR05HT120.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::466) 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:37 +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:37 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:38DA84F2358B974C5BD670F5061D4B5D2FE4E0206C90988D6484E24CC11EDF32; UpperCasedChecksum:11A882D3C204049D8FD7DFB1BB4F044152C526BF049CAEDC129E713D15EB1DB1; 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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:33 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [S8kLkqGvgqhYecRKVPY009uldRNl69F1] 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-43-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:16 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 84dc3b86-5924-49aa-b0e0-08d930561747 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjCyR3nvnqtBFob6iScERZNbTE39jqKA7JSldCBHGfLgVjIyIBOMeIDk3z8BgMcM+9HH753bE4RxS/FCPIMd3N/Q9tcSWVmluOX4hsSdN8xncsXJhPwzGBFI2243O3et5MecE3+oM2ZR+xQZBirGjqpv8YDdjp9rc8EU897I/YH340LP5ODD59p6sZVDkiFBCsEpeeRuPFA56JYAfVXrdV1TDRHWa5B1/7A2vwZPk1Z1wFN4YDyxZg3T2AlcWO/SKKA3miLDvELfbiAswNSGhnJyBjWT4ejROf0lJVjOTgKHYNLZyJuxMMfWEg5mYxgsK/NPqSNFXKptm0jMv7wEn1AW7ELbCTUCzbMVMDHBhel6nMCBHuu9kL8X7KPze66w5rX8+KprM41JLzB/ApaoZKXxJPWot4hORKHXxb1SPNao3ziCvJ3h1562/MNae8v6UwXTlN5qqEyIR3TbOxMEAB543n9z6nlu029r4WtXFyYBVqnfYIaFn8oM0rUJ9Ybzfrgj1KkPapjW06/iVvcZs1RF1NoNxSaH8Fs/OD0laMwzw3z4+OKM4zhJGvXsvk+SZK+DFn/CeOzFTUJiYsG4hSVztjG1T98rOueamqjTp1Ek0zpkGcec8KSsmZuhHCVH+TWreCg9WhZtEmDDY5nTskIzbDqWisgUSKSW+ACsOzkLutblKeyxmUrhwoopv7cDFB8wzhiTdDXULatFsnpQWw58= X-MS-TrafficTypeDiagnostic: DB8EUR05HT120: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WVQwCXrLOp+mPaS1nsryyS2Nq0NfZW6bfjmYNk7bJ15VKyxdf5s2r2jJ3ijHMXqxslXUbZa9jiwkUtREqkb2nGNLTAZvqmhnyCkNkZ/joYhJKNXLoHUX2kyg9jXomIcRA8J2qvhxx+sv1WjDDl7gGTMCAjBdIH5zlpjMLKSsxHNorcxTRyxQG1fKUUKNr2UcogmPcHXeAr3jD/X8zTUvQ9crOvlee6Yx3dYIfJ6XCr0xdwtTx5TxuJ+Po0uja8luhakBXwS8La+JhTwQBR6n328suJT7c4qGc20x+baoSDPY5OF4xyMN0m3iXrFF8+5P0ebaHnxA+ZOQAf/qxf8TM0YzX0xkjjAb9lZtMKO7k5DehT0pbg6VGaPPyEDZVmXs8OHuHMqSB7Xz48OLccJeKw== X-MS-Exchange-AntiSpam-MessageData: wXvkjWxH/GRXjRQoYdblot5QrbcV1AoG9uuoykMscOVxhlnS+gxm3L1bQj4MFShRitw8oXUccDHNZjeW7VeAFOLDyP16qmr+uNiHLrxe9ptejgbra29fZiYEjuLNjJ1LfM6u6eR09yCVrrt0ULhJNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84dc3b86-5924-49aa-b0e0-08d930561747 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:16.8329 (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: DB8EUR05HT120 Subject: [FFmpeg-devel] [PATCH 44/54] avformat/stldec: 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: j8DWFVnE+ci0 Content-Length: 1435 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/stldec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/stldec.c b/libavformat/stldec.c index 7b7c98577d..48e18d865e 100644 --- a/libavformat/stldec.c +++ b/libavformat/stldec.c @@ -97,10 +97,8 @@ static int stl_read_header(AVFormatContext *s) if (pts_start != AV_NOPTS_VALUE) { AVPacket *sub; sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0); - if (!sub) { - ff_subtitles_queue_clean(&stl->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = duration; @@ -134,6 +132,7 @@ const AVInputFormat ff_stl_demuxer = { .name = "stl", .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), .priv_data_size = sizeof(STLContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = stl_probe, .read_header = stl_read_header, .read_packet = stl_read_packet,