From patchwork Fri May 7 06:46:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp273164iof; Thu, 6 May 2021 23:47:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+HIty3p0X+Iuh9HrA+fjX/LJdebIjlO8BWqNkaD903lVTfa0MXEdeP3FXwVG27WsVZD1n X-Received: by 2002:a17:906:7c45:: with SMTP id g5mr8210195ejp.368.1620370026544; Thu, 06 May 2021 23:47:06 -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 w9si4029661edq.453.2021.05.06.23.47.06; Thu, 06 May 2021 23:47:06 -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=mdFoaenQ; 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 7696D68081F; Fri, 7 May 2021 09:47:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069079.outbound.protection.outlook.com [40.92.69.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB9D36804FC for ; Fri, 7 May 2021 09:46:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kN8VOMgAc3bbhb7GCouNOy5GgsRDnhEQoLZHRoe5rZOuWd83ggvK4yIjG5v7+47vnjGcjEjyMBmV8kMohKsLCPvF7xZALN3aDofyu6wNaUHmzpM1pDJXZn3xitmbemPODhi3PwR2o8nCP3/wMW3UBG/ol1lQe55j52sxDA4TaTPixwD6RuGuBvqS5YfTBRpwoH5/GQ8XCOldED2U4+9y6E6vaVFpVmCAlmZD7UqcIdCcFxxIa0S9WhnYNdBHFZ2CX6974c+atJNmI/zUI3iGU2pK5o2LYqxgmEMJ/WSmr58l+zliPf24qHLnqrOQ1V09Gi8hSO55TOhuZk4alBOpmg== 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=BmyTdkyvvg4/cC7w11CS6ulUXAFTpkTv3Su0h969OM4=; b=JiwhPQwXC0dPWu16/4NzA4cet6q6uy9Hv30jRWIOSHri8mDgUckRxXeulz6Zo3EiVbKb4WLXZaqv7C4n1ZJK/KYIkaJoDnmzyoYsoZ2teUAMU/ApPCRKscB45HNYg5EkO6FEgZ8DfmB/KV1T8Bq1susRss99V3XffP/YSROwMFubo/fG0JQJxhfgOXTZAiLvbOPTO0V5N95dAUklrnKKkt5QdJbGJrZUPrn/d7lpiGhjuWbWCD/mVZTVhZRUFwNfpPhh80vnqSjVBOvx0tEnFfpv5KJazGLXzsbVOzQ0W/hfPem55gAsH07qn+BFJIHI81JTq6iIkYvo0PZhl5DQmg== 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=BmyTdkyvvg4/cC7w11CS6ulUXAFTpkTv3Su0h969OM4=; b=mdFoaenQw4Krizi4KC5cnTFZns3+jQl/eYxJbzL1+Buu4Hf3Vvc2qbIYeQV8I8th9w7+R1kxD8trwse1auiXlDK0bNS7ZLbhKtmE4izodp63z32rWsCFbljN5v1B6pW0OkTitoxY67lYP8LzvumAjmrAuRgTomkXl3dm+ifhLYWhRNm48sxNsxliZX43WX4DYpcCgH/23X/2hgmU85lBx6Qx3HMNwLKdlYDI8UwwVuVgqbmSnaNo35WlV4tx+PJQHHTRl+KypSEXh3h99Ji2te6rh4ymQ6IP1FqaRq+Bq7ZnF50QGgFNva/frYQeJBlITcIdavSkpoaiHLLIbkwfIA== Received: from HE1EUR02FT024.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::44) by HE1EUR02HT138.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::443) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 06:46:55 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::52) by HE1EUR02FT024.mail.protection.outlook.com (2a01:111:e400:7e1d::181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:55 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5458639A8D8443FCA785F9C977C5786D5C2BD2C63B74DEDBF12F0D91E98B8199; UpperCasedChecksum:A14DE50CAA4CEBD6F82486138E2DA4573C8ABB27E293B9535684197E720389C8; SizeAsReceived:7602; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Fri, 7 May 2021 06:46:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 08:46:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Y8C0QyZqLsDzRERYpRTehQSHUVgcveBgNthii5jgpG8=] X-ClientProxiedBy: AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210507064647.362502-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0117.eurprd06.prod.outlook.com (2603:10a6:208:ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 06:46:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0d3446e8-f923-4ae8-533d-08d91123e75a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJp0x/TkBgtDYPJF93BKbTO5LtfwWXT+/TB5f/qgz8iIx5VUcj3/IEycI/MM/zcnKq2z8eIaEb2/R6N+mw8EadwwL/Bx08WOwozUY6ErHfFZNlJguRntu7R+0Vfpn5DaoHv6KHmc1Dm9O+Cw+PGfsxfJLHT+fjRB1ethtOVGMJUs7SXsDvFrgJvPFbFfQD2nFXjzlI2CSHotU7CSw8TrE9G3wDLwXOyip8fIz/jiWmdNu5cu0gbB4hLNHyzWhGNM2AuuWFggVylMcV0eLx7h32wMWxb4ryr9rNB1yedQ7NkNl2roKjtJopb54G0BM8hLIPDMhXddqzeaz6PVpVBN37CQ+L+jtx3YvLpG+wDf4EXFrcLGyFx0QUktldO5GEu2QBJcF7xL0Rxi34iUh8pmPU1Qfzd5hkIdTwBFrwtAsy0ncbl1VMPCI4EmvdZnFfOUlTAM3olY3ug/YXw/3ZSYXgLJGkjxh3f/ATP0VYmcYQuWGDlDRokXo6k2RqnFAj72c0ysFzdpa/JBdWib9sKLnyUUdXB5psra5mEakFgpOyWy9q9hmyd1TePJc2oSCyRd73M9MVK1PrG1h4pQ9+Nf6eBsVM5mwlxbd10QtEawOCM4uZeVN6URaqRYkdAH3zl8RHnKBpTbXHCVDY2sfJhpz+iRVvz2f70jMzpxGpIyvPHyckoA0sCPDwbjUyzCxAtWMSdkbtcTXDO8Q== X-MS-TrafficTypeDiagnostic: HE1EUR02HT138: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lH254mdZIx6kvHTGfq+XQ1/QpgtFSR63yiFXhRq7Nwc2T1vmUhub5GEw0/EaLhRccGLwLgxbFC4rB71orVMra+gAYVJIvMgjRW5iLAazL59DCAdfUXooFVeH7ggs2FPLFW6QzH1v3PLIcDvNIpKKvQkuI4QRkWK1SItYb5Tm5I4B4bWXSzFRzqXeuzJ+nfGQCQ98Xd/JcQkuQFOs0LAQGUbFI5xND/z359pTrlIyDdLRR2tPJhYGOqY8Y+iB8EAkef5vzl6sbJEnsAURLUZCvSqJ1+M2So64ovcfMU5i1BE1L2MQcIilF5zVl4qK0b1vrTLLPO7dQ77FjfAXBtZgW/+dSihfJGipkIFfrH5yBmjjXi3sN7HqMv/HRI/mP5jFCv4mrF+2GQ2QJ0vqdMH2Fw== X-MS-Exchange-AntiSpam-MessageData: lZhlRcaQj419T6r2ueeFb9RBlHKSH6kAE86WNuvwWQZEiDF9QCtZGcheAmhQ5kbbgfSq5yfsl3B4fSdR863a9bqlOW4oEoPXYyWufMBGWH0vCVdpuFvXKd0X9pDviUWgvztsYdEvV3bRj+nteJ1Tdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d3446e8-f923-4ae8-533d-08d91123e75a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 06:46:55.4808 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT024.eop-EUR02.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: HE1EUR02HT138 Subject: [FFmpeg-devel] [PATCH 02/20] avcodec/wma(dec|enc): Fix memleaks upon allocation error 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: Mui8cqnTJgCm ff_wma_init() can fail without freeing everything it has allocated; so add the FF_CODEC_CAP_INIT_CLEANUP to the codecs using it. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmadec.c | 2 ++ libavcodec/wmaenc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9081f35a16..b63ce66b23 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -977,6 +977,7 @@ const AVCodec ff_wmav1_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_DECODER @@ -993,5 +994,6 @@ const AVCodec ff_wmav2_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 89273ba978..2a78325298 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -436,6 +436,7 @@ const AVCodec ff_wmav1_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_ENCODER @@ -450,5 +451,6 @@ const AVCodec ff_wmav2_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif