From patchwork Tue Feb 8 10:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp693175iov; Tue, 8 Feb 2022 02:59:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyW6cB0t3BmZUggZBYHgJJK7lhxLNvTuMeRfpICNeYi5Xm603LvSqq/OcTZVLQ5kxpqImJG X-Received: by 2002:a17:907:948c:: with SMTP id dm12mr3346462ejc.770.1644317956134; Tue, 08 Feb 2022 02:59:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g5si60985edy.112.2022.02.08.02.59.15; Tue, 08 Feb 2022 02:59:16 -0800 (PST) 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=gBLm29K0; 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 035EE68B240; Tue, 8 Feb 2022 12:59:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2043.outbound.protection.outlook.com [40.92.89.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF41568B221 for ; Tue, 8 Feb 2022 12:59:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L7EqC+Y1AOkAWZeO9Y5Uuzxqvo2J8UPMXu0it6EHWdauwmrTIx4zSJtYyctTZFj32rbHmY1aSiYQZunZtlsK0HNXeLnNKrEHdgl58RKQOO/ouFVCC+9UbEqyRDBTXW9iDnsCUD/IyxgId+wAkB0y22FZc8OvF0b08iqjIKr0ewfgUfrB5m24yoEg10B5appImJ3BYS+5PlWb+vbpLtjEbYPFZqrz7AVrEmkxUnXNdJE1t7TUw1fHZBkbE0MNJlSEZkhcSFkAHf+EG2ZoLi/MxLoheBsM8KDlkl7mR1z0yvDjuzUr7b8YFPsvUAF8qM1zEnG434U/9bXxJ1ttzfAcyg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zbQvu6UtLJEqSTdswVqOs89A3XF9od6YHT55IHyvPyU=; b=JUdwjB/ZDDWmLo1wWz4L7uLOBo9XLJaAAtsHzkLhTBtcFFIGTynpdYCvUYeymhXVQuhuZI5SQeRTp2kLywQ6Y35ms4vJ32yHPfTKClczYppgxKXrSw8fh77o+8hR3P6IzHABU+2SnXSvVuD7uWdszTwaaZJ0m3ljFBbIcRzklCNGPuLa8V4n/c9OE5B5GtS66ksbeu9pFCvahqDai9j119CCUJy5+hPe94jLS5xP9Oh1hl0d7iuWS5oM8C1jApNgsLh7QaQ8VCPrFbgLxO7TZFGwxS87UAs41id0Nar2vMncsD4BJAMXyXLTTZB/2LlqzSKuiJfACj52Lem4gfWpZg== 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=zbQvu6UtLJEqSTdswVqOs89A3XF9od6YHT55IHyvPyU=; b=gBLm29K0yF1MmzKsunv+WBGmRIfCK+y2Bjkh2/zC1IErMZPjtV3WaOCHN0npuCtAcHjz65IG5Gco6QGWN6u4swGhle81u0IPmpiwWc1XzXutP7jWv+ku/aC+/XOf8xFrHQ4zWuCoV7/VHGjHB5Uj+Kv/smbXzSrF2YnH25DGWj3n9ifMLM/vmiLPsz+/o73OvUJsddZ1ErZiv8ZJHzjwB+VDRCxyTeWD21gr8HBCAT6MBaXFC68R+bUimGlVHals8sy2nIIiNfvhZ4jjoVUZyp1jyk7x6gJ0jbVmwXZ000NvdjV14FN5j/kjIIHMOwja6a4nJzxtcTU0ryj5JHa+9g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3206.eurprd03.prod.outlook.com (2603:10a6:209:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 10:59:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 10:59:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:58:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [MRsEtYMQ39X5lkpxxmAyzIP92Vo3ICpz] X-ClientProxiedBy: AS9P194CA0026.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208105857.1076022-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd4ef730-f3c3-4f0a-e477-08d9eaf205e6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjamiQRjklg1l/de+asbs+HhI+CmwGaFV2YTgQrHK8uND4KPlxkvhiOJT2dWWeGAfbKw6GPvqaBvCMDWgG1SLdJxfuKzWjkc5pMz7YmJ6Ecorr1Edi92PAZ+zw0Qu0DyfnImumSgFw/2X0T2Tjv880XdFAIKCCv/2U5XMB5A3of9tOb98oVjXYqnPGhZmVj+/4OY4rsoZF27lhrQ2RKkB4+Ddi5nXE53SPtxoDqaK5fu+cw+lvAJLZ0epqOofo+9/OIGISnNv2g26G3Q4hQYZxbzwKmOO9BQYA2Zk4UKUYh9kqA4q/nN9k6aGFnlzM+ID6i4CRGwHc9UqjDICMHKQ47m0C8YRu9wwP3DBaQHKwcLDW1c0YSL5GnloTAVnOGyaEVqwUU7qV2C2L2ejGRfT/OT6+9gq6B89cq2T2wQq207Lm2lntMP1bbOMGarzoSS+fSyfQ+sVjhegS5g7M6m6Ysvkv+fYO3h3a3GanU1xqPCg9CWnwfhAXsINdR30SrYti09sKQGEWMmwnQki5QfQKxKT+ZyxbmvKdLnFLdTBz0i0rol9vwvSeME6S0Dpoj+izEFGj+x5qBv/KYkww5zReSU+Ty2l3Ly+sYnZ2HdBPZ3oaX47EphIbxRjXxeYPhAivNXNbwH9AE10L9tbqkL+knFxx1g2EhLoS+4wLjN7Mm5e0rM2ZIR6UjjSWl7xxUj9r2yGrtk6daA6kwfyfTzhJAZfD/LCjTbIKXiY/zMp3WmE= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3206:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6LGRVW8DoqFkJ8CItJlPn4d2SREToIZdjiGiIY6eEHymlBBRYttJj/XaG5/TW92goeLRKmGFKhnFNlrf+LWyeO57jH7jki+p7LY+eWc9djAwAiIlIoPdJSViuR2jL8R3ImV0ALm3m1Z9xzy7MqfASzkI6tIi7LzyrDcZ29ktpE/KJHag3Vy6H7Vm8AmuTaEAtThB5RK3w3flm0d1MUWdL56nINBaIznRTq2P4104GbQElcm2rnpnKSs/TdnvVEhUKvx8+bkvYxZsDkZHTQyp56bEIWPSkR0zd5AOvLG4ItsEsf4Kp9aHPUIm3G4Q/g/ULtMtlPVItTQHLBvjfOyHLgCmCgk9SgTMAk0l2E/PiHuuxCDEBgEzuiKPD6BFkl5JEiZ/bIv5HS45kslE9QohpQS0ng/UyMA1N3wHnCIEk6YtV/JhnMXlEmYw9et011T2ErANDA/QQKzK2w1kT4AY4sL2w9VcuJzrmpDKwb8AfSWWL1NFA85s9KNSPTQ9SVdtM+2oQSrh4uBsCO8LT+xRm+6UsZHKMRc5qLW2mI2H7NjtnkHFuiOMpU4rx+RRkLgGwlTZJjCqIB4/Vn2IUYdCng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1X8ksYOQ0xGmTDaxnedwEo5swMACzlx+PjonU0c4H1Z6Zq39xYfZJ5Kku2myDgG4I4t7CEqoM6VcctlNMB5rZuCp2qMoeqBkH6a1aeHnwKXAqjAAjUJxhRcEO0PyAj2dM8Paye7Xyw0ufYI1H9HxtaqcNwCCNZaiCi11jz4w+dotZGwlUOoVOy0g3Ex+AKUn/VNWY6jMWdTfMZZANpQnmU69VOaggVu//mg2dXvus4YX0cOa8woroVvGi0VQzYsTgTkCZ8U/8UdPi1Gh5Jud89Z4Q1Ch9EmjcsoIDYUzajaCsdVw2yVvGPFCPKbRtg6xFSqn992zLuBERwWeBQVgzHqGkGnjgL+fub7yFnIuFpIV16PldhRDio7XYviDX1IOXnNTQquJE00fJCTtvi7xUXH6LSNv/yMxkojSIGKrhmNdoOKVqZMsW03t4p7BbbED+Rd3g3Q6aPG3lFOGtYn7QGAZOOkhg9MiwUOX8yPsoJ6p2Q5fyQDV+NOQJnouiQNIeKqsAozbg4Eyj+ClbuBdquxrF10PHtCp1qTCs5dmRctHwxn+GfjGdUVHE0dxH2+xqYWcl1pqih8ByWgKTiH3fwuD4w5eHJxRofufiGz72Uoj06D5/OynnjibJ0jWSXb48mTAplKmzDsfI1/wQiTw6TL0879iCiZP9dQY5YE1uCS9iyEZOiFGEe11Ut+Km+E/Cq0BIBnDagnGQiLJshezFgOvNgSBTy0eAOP8nJEXDEhaUWN3Yg0E6JrKhaWVux/GhIsnSuFwdwiWhLU4KNQ35Gne5Cy7TvN0778GN0yi0nkGMlTExc3uK1wYoQPrYVrsRGlorRz/jXIHNUYFb6moTjaH01+oywLQBBuSSfRVIhxtcdDBU7F+MtxboxcDbYLuj2l9Uwqb8ExNq43rKXSpnhHKDAXSxXlPzCLpkN7+93j/pu5RHqEvewSjsARyq5r3EiWc7hfaUkyWIceII1YkMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd4ef730-f3c3-4f0a-e477-08d9eaf205e6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 10:59:05.3995 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3206 Subject: [FFmpeg-devel] [PATCH] avcodec/tta: Cleanup generically on init 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: dwGObtVQ881F Signed-off-by: Andreas Rheinhardt --- libavcodec/tta.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 17b4ca9032..accac38893 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -114,10 +114,8 @@ static int allocate_buffers(AVCodecContext *avctx) } else s->decode_buffer = NULL; s->ch_ctx = av_malloc_array(avctx->channels, sizeof(*s->ch_ctx)); - if (!s->ch_ctx) { - av_freep(&s->decode_buffer); + if (!s->ch_ctx) return AVERROR(ENOMEM); - } return 0; } @@ -427,5 +425,5 @@ const AVCodec ff_tta_decoder = { .decode = tta_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_CHANNEL_CONF, .priv_class = &tta_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };