From patchwork Tue Jun 15 23:32:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4315178iol; Tue, 15 Jun 2021 16:41:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOL0JclKBVcy7MtOmWbZ99wC4j1f0k09/HyORh0lS+7l1aJ5lq5ShHoLkvl26T7J1PYGf+ X-Received: by 2002:a05:6402:1911:: with SMTP id e17mr753718edz.62.1623800469682; Tue, 15 Jun 2021 16:41:09 -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 f21si417268ejl.315.2021.06.15.16.41.09; Tue, 15 Jun 2021 16:41:09 -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=rA4+DM2k; 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 539E268A1CC; Wed, 16 Jun 2021 02:34:55 +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-db8eur05olkn2032.outbound.protection.outlook.com [40.92.89.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF6BF6802EA for ; Wed, 16 Jun 2021 02:34:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WI+cur549zuNGVk97Y/WnqDEMohE3gqJzjO+0X80+VdkqmjdOF2DMfb/EVOvG+Pih2DCk5Ctm9UY2tD7CyZqVTGVcMdtzh10Vaaf1MUkzT+9J5dQZsJ+EzcM0TD/jTj3x7vGTqYNo7XZ72zUNVGDdhW/dv/jWnZ83MG0hSMLEjPcKuKa0LSRp1VrQTm9yPzv9TbTtiFen3iil2ylgtCObR05OkSFB9M+jOgh3mQdZ9O4dmIAnTE/G87LAxXxStOl7kd2i48QuDQYbGhSxSG7IbsBUBOlmTdzeAkCrUJfj/APYduCJ6cRINqpz0Fjvlk3zn1+9PVaJNkWmtDnadlhGg== 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=Um7izaSMQlNWGtHvBdjUguzXRXL4lawfXyCcmItZy3Q=; b=VK2fl/ydLhHGBsDPFA19Y6BsQStyi4017wmgKSrB/25vIofuqdkjmfSJ5LENlSz2xXQEUmo/zI0cxG2ecNqCMdzYtAJJU8NqVe+8jCCMbgaZ4VFhtbZxeOu6ai8Nc1L7Enj2/VJY4gp5zN/wigzqx5op3TfJw6Xwg+1mps1h955WgdJnkAQg22ejkCv+ZFLZLjXi9UkgYbss8/n1bPHGFLxuszjJqbKReOcLntZn2P6d0PehrF8TUyTFzQSJv3SjTyh6Y38Qvaz5VyslKYR7+C6f+VSEzRJYJ9D143epapp4mGkAWM8BIC775IvptPnVCMYEzB9LwSwmfrtX2JQHXQ== 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=Um7izaSMQlNWGtHvBdjUguzXRXL4lawfXyCcmItZy3Q=; b=rA4+DM2kfxsazKbHY06almVhhUEMtbLvyXhLaJtp9Q8TgTKcofWxfKU8pVYzzvKCcO7dN5bOVERrzEd9fi0ErL1HNlQzfY9nc2cF4v4/ndg+MUnedokYCVUTNXBKEHOx+6jqSoRn02Z3jzxn/H6XNALoR2aFSABsvpneZT9T+q4wy6Ep6BK35XwzyuVLrpTCH75E14fBw/iZDYljyOvolB3elGXlEYZXUMSxFwG1Wr+/T8QEg81ftNydgqI/w9VTEC/jKDmMw9NUZLGiuOUdt7soEfY6H8e+GXsk38xLPALsh3vuNoQkTneMyQjS5JOMHEAJgMC6pFfmnBhYADY0xw== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4c) by DB8EUR05HT113.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::463) 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:41 +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:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:821A86C9131D0B77244C83B8418232B1474B50CA390A7F3AD422767C8558C5B6; UpperCasedChecksum:CF1CBFD3441287F2B2E561A2999B29637987689D3299201535705176D73858CD; SizeAsReceived:7755; 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:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:43 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [F6QCKmnF3A0w25AIk9XfwHdleCU5xCs6] 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-53-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:34 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 6262e6b9-c9d7-4380-29cf-08d9305621e3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjCxT4QjM6H/PPytBgYV0nFnK4ce95uX0hbSxS7/y5muNFF/BtCn3QXd6Evl28GQUqGWxNyXrJ0NRHP/+hV0BzSm4lwzz4FURKmuMzTx+wF4bENtOJzaACAY/GJoZpeDw5g2gr6zTlDnI3GxNRD0zW0IvatxgBdxvvx/HbeplLgKAUGF+KStpIMjdaK1kk9Q2Z/+mE2w5mDeaOZfAE/mqbMaHneGyGnIxo/Ht+sPPP9bkLx0qqrxpfg3NEwPdFFBAvOtKzzhAbQYCsRHw26ZhmYxtYt6eoHg/YpxAchkyuUfawCP7P0vKH+qWI+ns/YOgbOdS8srlMQ0DMgtf/CM6N4uynIxXMiSZH6/3bc1uxutMSNm2eatKrWirl9gO9Kfm9OgY1mo4/haEDJhMP+xOXlow1/zssc/rqEeOMweESK+g84mdIhgmqDdfTlLAZHML6oGK0N08GTizhJr1cjIuF+hY2z0IbBue6iwBSvdciVYXkWrDrsSYwqmRksfztu+EDGAlrcf2iIiLzPYSmcZTckcPUgPjH5Z0j10W6DmoQ0xgu1VXqu3picwAb3+T9HL8Au2A5TVdc8aYnxFx/RgbiSTfQtYBAJOJTSnbUCy8pE1GBMGhh4DRgTBdEBzMmiafs0dgcW7ncQx9OVHTLHcxQgmbdlKaREdK9mM3Ie0ifZ/wE8u3LZq5nHcOTn6JYoXzzTlYJNE26sf9Xs30hmYXNC8= X-MS-TrafficTypeDiagnostic: DB8EUR05HT113: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OFhnDbgr6p9SO4BLC4438ZimNmI6TTaxeVSeEt7PcwaWOFdB1NGN+JRY9/AdRMnW20INcrLP+8UXlj4Od+0vS+gojxMNCeC7D/hMdbm4DtynDpypgAPFZugplG91WqstmevVq602Jw0NRGV2aTyeTzgiE6zA8iqC6DbYpTSUmc9AdcnkDafIFvlhiv6HeTfGFf3atkMkai3vN2232j7kicFrTpEcj0HID/cCqZ+i8nt7/cWDp1qgWEitPuz7u/N6/l0U2ZBLUzeL8s2ipLYO1ngOFIFFeXbpfxLifkF81IOJ3kz5SKV2gcOvRqMBlu2lQkAWxZKcF8+E9Xl2ENEfZCEh/qZLIu4JotaojyRjBkC0xuBiZDHNQ49LP5gFLx17wZmUR1x1TOapSWjg9Q3Gxw== X-MS-Exchange-AntiSpam-MessageData: 0uekkCb1qC6IY/zkfNUrr9+oj9fvMU6I42VyIybPiF4cmBcIB9WHl1NZbxip3szLVHZ76Nl29BU83XoF2czl0L6Hc5MS1/U6tE6wCoM3hYvebUAPhopnx/99iKRXBTdveOw2gyry3KoJg4YdEQR1ZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6262e6b9-c9d7-4380-29cf-08d9305621e3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:34.6520 (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: DB8EUR05HT113 Subject: [FFmpeg-devel] [PATCH 54/54] avformat/xmv: 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: cgEV+PLEcuMl by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/xmv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index 36816ec005..fbe0f484e2 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -149,7 +149,6 @@ static int xmv_read_header(AVFormatContext *s) uint32_t file_version; uint32_t this_packet_size; uint16_t audio_track; - int ret; s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -177,10 +176,8 @@ static int xmv_read_header(AVFormatContext *s) avio_skip(pb, 2); /* Unknown (padding?) */ xmv->audio = av_mallocz_array(xmv->audio_track_count, sizeof(XMVAudioPacket)); - if (!xmv->audio) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!xmv->audio) + return AVERROR(ENOMEM); for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) { XMVAudioPacket *packet = &xmv->audio[audio_track]; @@ -214,8 +211,7 @@ static int xmv_read_header(AVFormatContext *s) packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) { av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n", audio_track); - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } } @@ -227,10 +223,6 @@ static int xmv_read_header(AVFormatContext *s) xmv->stream_count = xmv->audio_track_count + 1; return 0; - -fail: - xmv_read_close(s); - return ret; } static void xmv_read_extradata(uint8_t *extradata, AVIOContext *pb) @@ -588,6 +580,7 @@ const AVInputFormat ff_xmv_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("Microsoft XMV"), .extensions = "xmv", .priv_data_size = sizeof(XMVDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = xmv_probe, .read_header = xmv_read_header, .read_packet = xmv_read_packet,