From patchwork Tue Feb 8 12:17: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: 34179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp750716iov; Tue, 8 Feb 2022 04:18:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJySxIXbupq/x14Ldja936O9UH5K8ZhQWU8rXZYc29y0xRC1wd51kZg8jrFVSZIonx2OU4y9 X-Received: by 2002:a50:e603:: with SMTP id y3mr4256551edm.270.1644322699197; Tue, 08 Feb 2022 04:18:19 -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 v26si5552142edx.489.2022.02.08.04.18.18; Tue, 08 Feb 2022 04:18:19 -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=bLAZCZSR; 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 63DDE68B203; Tue, 8 Feb 2022 14:18:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073035.outbound.protection.outlook.com [40.92.73.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8062A68AF07 for ; Tue, 8 Feb 2022 14:18:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eM6CYRAXGfmHlaJOx4/vWaL/K941Buu8yDDC+7IL/I50pH3dFFz1CDs29cFMTZI5VBuHd4kwpNnL8zp2aj5ymZf8iGicP9RJfmhAqqRz/hkEmoqZ5qC0EsLrV3zO9Xg5pdu8VCgDFo+KDodOZnsZ30CcYpx/cBHGp67+a+O3jYgVTkvN1xzUIPrUXfqeqQVK9rqXMOrZsEyqsEOWWQbK132iSYFanEBUQs1TARC5onSR8ByV1Kgp5nwzwoWN6YCu59DULPXGBukFEPsA4DGSZpaVGOsHsGsNFlcZyUqczDyL305dykjKPO/MZKsulJl4bM0VoN285VQVw2V7FVhD/A== 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=6wQDU+ubAVBCgJKdEr85n3QWlTwaTSG1j3kZ9RrzofE=; b=YMABuqfuycO1mglRUN5Jm190qrryPOFJQykkQLHBQUqVW2Npy2v3uXZpgD+zb2F1Vnju68Ri82nPpBTFOkGFRvBHIdoyGvy9CpzBaf9TYGfasWypT5v6iyQHSEx2sz4MGEWUDO9YXniO6+LAOH2mDMozFyVr7i9iN/cMJKcbjd0BFfBYt/sTntnp0/R2vLGGuGQvsjwQAIN955i3GvZ0PiEYhjKubxG/h2ggSvakYIvCKKLSvPQ1gtPJv8d9hndie0Epq4m++JEZ4aZRvOBovx6VhIXgWQ+HkaYMn4kRFMN4UKzhQljarREz3Zp334oRdhFiVD+sGo/1EsdsYo35dg== 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=6wQDU+ubAVBCgJKdEr85n3QWlTwaTSG1j3kZ9RrzofE=; b=bLAZCZSRem4BERaYsk0gWVvCnogsCfYEFwY1J7doMrpeo4/DfNHXMTAigfyDrvdGbblqNE529Vbu2wrFItKG4Ua8Ic1qXqck78rsrnxRcooHdLXdL4/Y3/g3W1hv7SK73O1cUegRgjOqUYh4Ply7AZ7DIeaV4o8OBjSzJ4E2tTWO2iuk6BVwfgnyklzx2Xc+IxZtzif9SZDuW7th3yNwC6mRllCA3j77ls5C1OLguHTw8IpB7Uo2WcnAnxdWWQ6624KH/vW7WFoKrJloHVagmbJHg9L4WLnAThlowT+okpadZg2ZdbgnAkLU4TvovnAfx93EQOcTaAeoRjL6SlW4xQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2255.eurprd03.prod.outlook.com (2603:10a6:800:28::14) 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 12:18: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 12:18:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 13:17:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [ElQzn8ujdXsEnhYBD7ZoLKRkSiGazRSs] X-ClientProxiedBy: AS9PR0301CA0018.eurprd03.prod.outlook.com (2603:10a6:20b:468::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208121757.1086667-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9c270a9-b30b-41c0-c34b-08d9eafd0ef7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjamiQRjklg1l/de+asbs+Hr+xsdVEDdP+V2Tsj0txAjEZxbFhh59qmy9n4MnpAppmJQlVNxZkLyX+uezPBs/Ii2bpT+5T1k/PgSJWrAS/2hIodWKb30i0XW14nByJvK2BsqBBh91jx6H3cHCK0pudTZxbQO4QPcp0W05f6uxxVcPSuWSBA6geF66n6FqgnBk2ZSPzcBA20xcdMVPerTktaKSOMqwAwj0aCcYPOBcytXGv0aU8iXy6fMU1fYaMqc5BgAJkG5yM/3Rx29ROQgmVIMlQdwK/m6M9nu6lBHFa/bkGlhXnHD7m3onjrxjttxgiLgZIjd1T+gSfAOv65s3adAMFcCmSZZ6LmfNRxcK5Qq2dbjwTvGPknR70rJda/xJGUKyZePcUhBAK41skploHPBrGVy+2M5feRRdx7ByxDftPegJ2KofkUHj32nSgWLSO+eiPSajclKZZ8IeUJjw+2loChIJ2dyRa7J2Z9aa/+QqA244IfUn1wCruwaejKisvamkIzz9t5bTtUPtq0Irdy3nEQmJpgehLMij9d64yKBkbRwGjshU8OnqvxAZycNU+JFK8CAd2u11As6gDbxyMsBuz2yvF4Z13lUUiVRg5C8GmD8nJP2SN5CGCV0HQg/twXq08rONZzLLZfQPxXQcYumeYLNmqsaIZWrIevfJ7NEbyHWTMvrUKGA1JghlL6Vt1+fyQnKXViMaadOMlmWw+5hPfTGuEhogCmW49LBPlOjQ= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2255:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oCBFwc0RNxNCzcIlilikrlQpG+sYaeZc307VhsdON2jyKdg8QnHj07epJ4/GpSVgce4heMk5BpNpSnZ3LOxNjTN7+poOg35X/TNptyS7KcDeTLGwY5aSFVyIrvTRSsGDgFtrxkkz774Lf40j0Q6n7WehkOve+8ZZyjQ7/4QjZQW3SJG5cTUr50SYiA0aeIWySEJaC5TlOL/JiNL3emeqPAj62OpGpIk6iJkdfMRXw4APPYC8iqRZ0HRIMcmVyK3WfwqmVZe+3OXsP+NPfav3bH6jTHt69YvFWT5foVGTHJSTcozUMAov0jmk1BQTm+oyka3KtpznG4h11ATtHeQbu8SY5DFdvrTMwVKe+r9TmqDsRskC70JX8Uufj/hBLeXaHJseHeRUHW3RvF3O+CtVdgztbHHYA2n2P70IcD+zIf43utxl1nUICLGf+ztYSBp5GmaVmcilYasAgIEzbiSXaKP63OSgBcztwCx/n5493utnVibXuaUvzYKIEQJns8U9503d1chXx//Ny86R2fvdKx4n7QBGHtiy1uIKdP2mVI3kTHBxVxNrIGviZSqYdiYn86zOJOFaBw6qTgaHohvxuQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vrr3911iD/CKrMELZlXJs3WO5AgLIbVTJ+fCL8McWjmkcr5iFSeU6rWTyhcX8zkySdzhQarQuouGE3x/3s0EIIE5LmYPZ6yZwBvv3OhOOSgv5bz26u8uM1bDu1Ti2T/SCeBtzx4MRXQde1WbJUK+mGIoeNi3K+n6ciN83MmUTAnxPycPrDS/M/IQVE5UrR+OR5yhaS5pD0sR0NaWcBu1YbCEMMvJsQfnBzXITkrZNj6kRvOGCjePBLljzyRDcotBr8whwSBoY/5u+Oe0RZxmWcPEN47e3M1cU5GTJVWujhdn3AB7KbLtRKU29mi1jAnFNjBWhvDm1OKr6zsWKU1z5lUCIJsSgHfRb4jAq1+QsMnCOKstlnTdx/OO8T9QwdrB4IbreN+MrrkrJtSb3WhCaP658nDB/lt6lgDKUz32oqccjUyGVK6EGVJQeYmlQUNBzpw5lBq1Pr7wqXKyxREcC/XVvYlPpYKNdhzDj9bFX54COy0QpwCfNtJn1DUZBdVH8UMZg/hy193KG/TJ2Mhpkel4DMuSptf/bSghtlggTU1Q4ON/n2v8ohw0ylR9KGvLoi+nMXyzSqGlrXbxlQkjqqtlK8rt7HJns5ljl+DXoEFMtvKUKAwaWv41iqFHTPt2dqW05r1wgL3zpojXnQcqBMWzfga8ufS01VcvBK6FvcSMRYKEjAkHsJ+f/FIbBwAvnhHIJJcY4XlXxGxVeQpfvzSGvrJhdrHXMaZ9S5tRwxvInmV45BKVXCIkjMZ1Vdpgvg5isud2iHrsPkgfstPoFVVbZLcNMHqcxQz2m2jSqzh8rGODOUbeG6nN/OVzPwQKzad1pNlAIIs02t651i71oNXOtt3/zfJ4VNsqYJYD3H2VMFmbXD76DeNLfa+JeVI4CZ5fOpUiOqYtsNtczWrdhxB8fSD6P0uhAN5fHiOieTIjUDSlVxE9hYFFeK9KFOZ8Qo2C+l5Gon5nt0bpISocWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9c270a9-b30b-41c0-c34b-08d9eafd0ef7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 12:18:05.0370 (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: VI1PR0301MB2255 Subject: [FFmpeg-devel] [PATCH] avcodec/4xm: 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: DOqDRtNxxd5u Signed-off-by: Andreas Rheinhardt --- libavcodec/4xm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index cb315cd7e4..cb361772d2 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1008,10 +1008,8 @@ static av_cold int decode_init(AVCodecContext *avctx) f->frame_buffer = av_mallocz(avctx->width * avctx->height * 2); f->last_frame_buffer = av_mallocz(avctx->width * avctx->height * 2); - if (!f->frame_buffer || !f->last_frame_buffer) { - decode_end(avctx); + if (!f->frame_buffer || !f->last_frame_buffer) return AVERROR(ENOMEM); - } f->version = AV_RL32(avctx->extradata) >> 16; ff_blockdsp_init(&f->bdsp, avctx); @@ -1038,5 +1036,5 @@ const AVCodec ff_fourxm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };