From patchwork Tue Jun 15 23:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4310976iol; Tue, 15 Jun 2021 16:34:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysdknfTcKg6PzaVpVScI+fTBJqy115uTmrd9rY9KdrPSkAvBnt2/NPinyMjOhySW2ux2WM X-Received: by 2002:a17:906:9419:: with SMTP id q25mr2026349ejx.341.1623800067394; Tue, 15 Jun 2021 16:34:27 -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 bc3si251811edb.214.2021.06.15.16.34.27; Tue, 15 Jun 2021 16:34:27 -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=rRA4Rp5t; 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 0131A6899A2; Wed, 16 Jun 2021 02:33:24 +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-vi1eur05olkn2012.outbound.protection.outlook.com [40.92.90.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACCC66898FC for ; Wed, 16 Jun 2021 02:33:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D36VbifpHeozFO06PnOI+Oh1lDpXpNDO95XvXA94eavFRtWg3MEDoyWBSAu+jkBEYADcqNHw90tQLcCJsiC3Y+BepwIhQRrXSPaVtsXCi8WKhhL1lQ/PLfpg5fNGi1vGUllRxO5WOgdig7H4apvzCVLrIBYnEjwMrDlLiBuyhWWM48FgDgVSz8TniTMIc3YS9eu9nIjEy4nu1uzW5DjWFnFyxkGa/LV2qVirkLTcVPZA92tWzq6wZcuCzfNIWXhXQDXKbaHHzTx2jDBJyMS6NIWOU+hRZoFies9UNOc4EsXfMnLLOfBuLp2uVvHFXKrS4tOysimgJg5kqDbMNC/Wig== 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=vPXgG1BX7ToP+npp2uUh7zXMD3NIzcu2cA1g0gLPUAs=; b=c8yLRU6tHc9MaUtB6vGMZIRGNlEhXLWp5GDEBOVxLo9Yp5PAvKGWZ2DHPH8lcmVvHh58H2Kr9aLvX/dkukVDk6WzF9TXdjknsowZ6Wj5X74CYKJ9NMQd3FtRKy5Tc6vX8WSn/3zDK9F/yZUmF5OPJNRltWVo1fNHLxuaQbGbWo508gkeUFfWYNYPmrR/LZ2gSkbCFLdZxSAVTYhk0ULVylM6R69oKaSeCRVFSw12ar4dBOLu3NQmOUeI4Ons2K7v1HswJK7A3/EsTOLr3x4Cbtzjnu4ZvDR9z/NpAtkhX8V7nlGQ92gbdiP9vcXQED6UUKWOIBGIXhuXCy9o5ADnIg== 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=vPXgG1BX7ToP+npp2uUh7zXMD3NIzcu2cA1g0gLPUAs=; b=rRA4Rp5tpd82qfSkvaNjQefBc8oZcRhLEYUBN/A4dEKYLrDO8J2KN3HZKc1PlR6Ntx4mKdDm9xj5OLUHQSHHzXyHkObuoCGF9cm5V69q+2aiv2kwd07ua6H+MKZw1ls8ZSZaMHR/88whiSH9vmoqrvztghnO2t8FKbXDim+JpsyAQMOTiwbmkIsB6LPB6V+q59s0abdloXW8Mvg5G4kt8f30kefQmqU+pmTEjpcFbES50BhmAS8s72rGGCtbQwNbFoIdsQOeNPRuJH9kA9SvDzTSvYO13cn7Y+W0+aBf+RXhkK/7O4q3Ir4ewudUAJWt9G+ONK9MkWp0Jy67GAYLZg== Received: from DB8EUR05FT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::42) by DB8EUR05HT096.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::80) 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:13 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::46) by DB8EUR05FT045.mail.protection.outlook.com (2a01:111:e400:fc0f::383) 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:13 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2F5F54B9D4D59FB1593B79686715F49BF415A80DF0632830F98676CB516922AE; UpperCasedChecksum:3A073132D5493CBAC3A12765D6984143FD3CE4FEDBC3499062CB2918160639B0; SizeAsReceived:7596; 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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:31:57 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [lJ+yHNGl5JXzW4koG020kUOOdTAYillm] 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-7-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:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1833d5e3-5b1d-43bd-3d1c-08d93055f187 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n7LELivV0hd94OsOoTMDQQ1xFW1CnKvcl+LTZFSCwpb33RBomrMMTf2dsL4TnHnR2e3Rn75zA37qzR2mtE/dZ11M8QoGe4c2nsVNppbob7NS1ZNoNdo8RSysI9oTz9iWH3qe7bjkeKl/nkKIYjmajp6QwyHHEMOjptuCU53CTW6/2lz/M+H2uugyF7lkXcyISuaqs7YzaJLyF5Pksa5OwhsC0Sx3lPySwh0DGOcGd2JPSTHvG/3Ck+/6XKQA5gyxVeGMOAxv6d7+2w/G+clA/Iu1yRxvloeZP6QFHNYGmSF8g7NJNnFO8ceqjV2QpqT3t9JySZ3y3H/Rb4OhmyTMw2QFJ5q5JXThb2YO0+HG4nBJptvw6hF2hRh0lzb2DcQAIv1dCRI8FkqfxHXIgtK7p1ityeqnU8ih0CDjMfGYMQ4tRwgcGd449p+rYjC9IiIanZSuDoBz37uFHl1A6Gqb6tdveexrUJ/uPo/FSeFSeAXKJWrHcbWuObWMMVZGvRAZhH2kIPO+TNfFVtEbKeErnHtvpJF9oclW/nwSh+EVFHYLY8u+KX8Tlmn5YZcK1GoxAWgL7gBJSo5knOA52BZq8LH2jWqC5a0FwEZ6hHMctiUKo7kqeb1vLNF2mzRSx2o78El7M/9BuNYdMWWRP3oQMvfTiTxIkH3ePAMZ/w4PEG9YlCEwjutXLG2OK12BZBDDZSh6FiF56arbT1QcDnK2iYLw7wE4MEQSlI= X-MS-TrafficTypeDiagnostic: DB8EUR05HT096: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OS+ZwJVgH1y/5JaaJgijAj0BwBpLZd1ejBaG28ns0wClecq5gWv+rbNQC2WyyjudryE05OF4C3JgtwLCeWpMzOy8dSfVCP/PdKjhkIkrH1Y0hxUQmCu+VrumSTiO8m5VPTw45yFJubIeDe9vKkZG8Vb+5uIuhkAfO9NUeIoBLQNX1QsAPe8uDzUmXL5Gjfz3tG6iSpxibOrz2WXxhZLttdSWfYWwcEBuC9CvKZCywBVjISk6K4n7pXx42dCQHJgRJnBE4LgNn8vVjeGOAk9cyMsxoh4aJcZZAFRWPC2/nmmOS0kS9jHnj4i3jkf2EwZCqy9ypCtd/GH3KslCygtBT1VtP1bvhxp6S6gwL22lVkFjO2WlzwHcB398OdTieR3YLCGglb2hMdLP2tqtNGzT0A== X-MS-Exchange-AntiSpam-MessageData: f7xKVconb8GJjYTZwhnbmzkq6e/s/zJSRzVRO6rbMufDwwA4brZ940HpAGF3N3gkXbua6m5DavROTeeo6hEuUDQVJBTg9DCj1v+Q+nRMvMmbNR6a/qiJNEXVFpC8xwAwkyzFkmk/eiLmZ63N5D9DZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1833d5e3-5b1d-43bd-3d1c-08d93055f187 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:13.4500 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT045.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: DB8EUR05HT096 Subject: [FFmpeg-devel] [PATCH 08/54] avformat/aqtitledec: 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: DLo4GEZJsjc7 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/aqtitledec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/aqtitledec.c b/libavformat/aqtitledec.c index de28097f2f..a37c9bbeaf 100644 --- a/libavformat/aqtitledec.c +++ b/libavformat/aqtitledec.c @@ -81,11 +81,11 @@ static int aqt_read_header(AVFormatContext *s) if (!new_event) { sub = ff_subtitles_queue_insert(&aqt->q, "\n", 1, 1); if (!sub) - goto fail; + return AVERROR(ENOMEM); } sub = ff_subtitles_queue_insert(&aqt->q, line, strlen(line), !new_event); if (!sub) - goto fail; + return AVERROR(ENOMEM); if (new_event) { sub->pts = frame; sub->duration = -1; @@ -97,9 +97,6 @@ static int aqt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &aqt->q); return 0; -fail: - ff_subtitles_queue_clean(&aqt->q); - return AVERROR(ENOMEM); } static int aqt_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -141,6 +138,7 @@ const AVInputFormat ff_aqtitle_demuxer = { .name = "aqtitle", .long_name = NULL_IF_CONFIG_SMALL("AQTitle subtitles"), .priv_data_size = sizeof(AQTitleContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = aqt_probe, .read_header = aqt_read_header, .read_packet = aqt_read_packet,