From patchwork Tue Jun 15 23:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4310150iol; Tue, 15 Jun 2021 16:33:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK5qId5Hbyt0Zbg5UUJyM2qM4b6VLovjuD292HjUZQEdnoQGVmzsKW4YWwqUtTEt/Tt8yA X-Received: by 2002:a17:907:2642:: with SMTP id ar2mr359892ejc.391.1623800006649; Tue, 15 Jun 2021 16:33:26 -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 f10si244340edf.268.2021.06.15.16.33.26; Tue, 15 Jun 2021 16:33:26 -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=nNaUgYfV; 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 B8BE268973D; Wed, 16 Jun 2021 02:33:15 +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-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F70F68834B for ; Wed, 16 Jun 2021 02:33:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c4OnAX+/DuT+a9i/7YPqcYyLPoeqWw9SceoISD/ZPQ7vplsfTMvxkkVS1CbKIA94IdW7yoBS6mvx8SlBbPs3sLL32IzcEw2M7gIzya+JA0xcOkE0r31TGXpI6b1c/VTbJ4hepfkYWiHWPjA0OpSIUONjXKTIqCaRDf0lIkP4po1QeK9Cn6UXq8qI3sxLTY7bsnhrF/0ENbaIGVbusgGJgSR3AnFlany1FkpYnoWoUl4juz5op+JftnUvQhsSiMpg8xB9af5d1hWdSz5tnOUKZNaZubVS+ZF3ZqTPM/3tWF7+/HKWpdm0/qdJ4Mi+KEXJyDRh1VvYt3AHX0d1qmLetw== 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=M6ezkpaXycK4yvA1NGz3cHmm8DAwTgw1dJuxdDowWZY=; b=ZjHyTXFLSOtClqksjFNXvyUU1jMGQ4TCv0+QuGHxuWfOgtQoDJJfYhpdOHd04LIqZrB0OFpN4BCcOcGioF6IuLGIz1Lm4gXK69WfuaC0uWc6diOjTeiFBhYqyq34FheZr9nLvSqrlDUDBGbtQJMhHkazAYwtnrPgQZ0UdWYZOLANi38IOV+WrYOqAxvtXXGVgQNXEb6uCFdLWJ1xDNwtY0FJhHI5y2SGKSKr+jrTWQi07grqb4FSKEPar5RQD4kAkzD6/t6cMh1s/+aO70gxRaRvX8vE6h+oE31HXwmCxbwujKTlToDg2wlsMqLz+iQjdfWW3gxcZvYtOE2c73FvZg== 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=M6ezkpaXycK4yvA1NGz3cHmm8DAwTgw1dJuxdDowWZY=; b=nNaUgYfVN0kwhf9gYlCJO1ZT5qQCFvcfPZDTnH2cyduSnmjYOrpwbXvfGUaiqdNI54/dOu7Qwb895PwyeFwPtzW6zbn2GKPnz1WDwUTld83H3zlTZLIbFp5+xgSe/bKwi17nc8jzqQAiVXO1AGQxgpgBDVuq8BAwDEz0qlbxnO+ZkzYldWkq1yPK4ln9SBRTItSQxYsflSWKCkQXrPECvl+B+3StB1iuLl6KvD0BTqS9smZPZm8vn6XqK3oaC9oAkBXKtBJ6A1y+cXaCtUakrhZm/9XB+FOhWJOW7g/7hOuxYbNE8Ij6xDILGfhv09oZal7/JvxwrHRHgrfJDoznOw== Received: from DB8EUR05FT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::51) by DB8EUR05HT048.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::140) 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:08 +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:08 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1FA174F3DE6E20451D6FCFD5A73D418F1A0A2A68F3439A7BD9534E9B2ADB890E; UpperCasedChecksum:392D4778B675436BA8D192AB0655C2E995A6E76E0E16E65F9D33586E4DE0527F; SizeAsReceived:7591; 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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:31:53 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [EsPx85Eu+AKsiy9siyWI/8g5F4GfnsTH] 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-3-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:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6b915a39-25bd-4e34-cf89-08d93055ee6f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk92w3tzm64AvQFiLaB+QkiU+GLTn8sOIdTGEEtTi39couGgNrKLkwZH4Om5GEhWqkaY0961ddGLJAAw/HHZBhf/zHuumruAwRmpndBFfSGTBaT37C56G6w3X11r6buHKmXgMFARM3ACDwotEAe+Aj5k52DtBidEopT+Plwwc2kMsIBQmV/RBx9KoxZbaUkEQEQOleHvbHW6Gxye7C/WPvPrGUDHiLvgLNJCOyTpT5Q5fv8+Nsdu9uLpIPmtd9pCkmWx/NjCRqkGeJr/wbJY/3RRqiqoF8oOUtEsJ8D4pl7suIlQDk8m3ddDlauWp0FaaB6x7ZyW1p7FVx74Eb1eyEbU3Jh10aM+p5fEDLorPWZqRwTohkCS9gXiIgfo4Z8/3KZMoWICtG2Q+o/p4BCf+beWsgFIzv0poo4FboQqnkiKKGUqvMcJYmTH3/1IvBHPD2jJ7hxAzCc1bG5s72VEhtTYru6R0FAfCInsaQzPiqWRX04E1ymNpOemELYxhMww7AXvr/UafNGYxT/DAcY2QHKM2/DuxsoCSw7PY9IJf0yGa4ywjVneV3DoNKryInNi6daNfZJo9in9Ke2NqzJ3jJnz8EfTvm5QRew4pQXPtOrY72FuKAJUzFYFKrNZMwpl8nYB+ucLpTlBAJMmK325yEtR156oztNdQmD/KsLnRiATLMyDPQF24fVCDxKQsbrk/8gSETc51wTuIzwZFqGL9us8SFgZdQKzU+A= X-MS-TrafficTypeDiagnostic: DB8EUR05HT048: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jHovoUDxev/6/3wT+ldwuNYHsFOMbNoIYh/aGiOgLVBKCfNWTnVijy0oGgeR683WEbVD4qlerBoh4dyyIFIiJkY9FqMCitOVLGFr0533BJ6TeOU5Mkd1vay8YO70DuryCJ1ZZs928Mz8h6pqktWWcyjhrnPbhny+yZPCDY4xM+HkK4Jx/fZX2/LoZc3ESFbj9b0fDQ5v293ar/tMm8RoV4FzP8IGdE6vdY89JPz0Ws6JIrT9vIImyCjpPZhZFeVA9IKJp7RXfclp+HMjlGtcx4R7Zi0L8HbK0dgrXdxV+l24cLxUOFyMq6gZdyXxKXLKUUXSoSNs0g7WZUtX2xdOuK9ue4fEoOiKySvUd0aX+JDOSVZQcFKINr/TYEEMKNZE X-MS-Exchange-AntiSpam-MessageData: kwmRMPgncZi5UESvQyS6FP1L6tYfJKzSpjRuzHggp/EI26BXJbkqfFFbLVsEG8ENppSFV+Sptvq4YdtigAVZJu9JtN0k1aUmUp97T9solFIyh8KX+xhO1rjvyIcPPPvG7Yupm2qxjpVjSuXtxDC/8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b915a39-25bd-4e34-cf89-08d93055ee6f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:08.2723 (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: DB8EUR05HT048 Subject: [FFmpeg-devel] [PATCH 04/54] avformat/aadec: 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: bOtLItCcopVR by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 70df0439bd..247c498147 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -175,10 +175,8 @@ static int aa_read_header(AVFormatContext *s) /* decoder setup */ st = avformat_new_stream(s, NULL); - if (!st) { - av_freep(&c->tea_ctx); + if (!st) return AVERROR(ENOMEM); - } st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; if (!strcmp(codec_name, "mp332")) { st->codecpar->codec_id = AV_CODEC_ID_MP3; @@ -230,10 +228,8 @@ static int aa_read_header(AVFormatContext *s) avio_skip(pb, 4 + chapter_size); if (!avpriv_new_chapter(s, chapter_idx, st->time_base, chapter_pos * TIMEPREC, - (chapter_pos + chapter_size) * TIMEPREC, NULL)) { - av_freep(&c->tea_ctx); + (chapter_pos + chapter_size) * TIMEPREC, NULL)) return AVERROR(ENOMEM); - } } st->duration = (largest_size - CHAPTER_HEADER_SIZE * s->nb_chapters) * TIMEPREC; @@ -418,4 +414,5 @@ const AVInputFormat ff_aa_demuxer = { .read_seek = aa_read_seek, .read_close = aa_read_close, .flags = AVFMT_NO_BYTE_SEEK | AVFMT_NOGENSEARCH, + .flags_internal = FF_FMT_INIT_CLEANUP, };