From patchwork Wed Apr 7 23:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26803 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 823B0449738 for ; Thu, 8 Apr 2021 02:56:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F544688078; Thu, 8 Apr 2021 02:56:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072062.outbound.protection.outlook.com [40.92.72.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A4A6805D1 for ; Thu, 8 Apr 2021 02:56:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fpx7Bt71NvO7axewsaLCQph3ZYvmh3RX333tusYqDRbyW6uQ/caFYzfX4SmmL21Pjyase7ygqt4LyU17dstIeyjTKlyQPBGMP1TyOVmcWlk7YX3ZrG/kfHFBynukuONA97sNJ9vgJYkRn7EZCmTNuv2Q3W2TKOG1A4jWNlVMrfenXs0Q8uU4RyukMmglemwx1zTxobZ8gfTZonZeQM3VckOUiDVRWgsKdcIhiyRH9xMre5w1DYmIzPnOEQL/7C+SmoTbFIYjoD9Cun0ff/jocOddEAWizNJtIj7JnZyVXw0qWVkeK5jZhblDwdIFIP6XzP5aYapa+nOH5HCEe9qUpw== 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=34IvAY3uJ5K4A66NHS+fVZHUyIZu0bPdqAIFENKbcKA=; b=hl5Xta9g22bT/7Mg3bW7TN1RQLx7eXm3S7YINotT3RVQrrFkAx9oZhhiLsoFbGQyAH3cbtVcN0XNMXaWvMrHtoOUCU186mE5CpQ9cJUgCdk2Yae8snF0I78ZaNAds7MMASeqkUfOmfRlH/0CJhW2+Iq0ZjdLtpW1IopX2+MCyb7sWdLjvEsTyFpOg1aXPnFX/rAvm6CX3pyOau/Q3b5VAauTt35+T66SmkR+ZqHX0Nei4OU/yxFqgAk8pXuTt4e8yp+XjnZTrdVCl2yFdNugPzk19DSvNHLFdbxrEh/46ThknHWhPDAWev5xHmafsczlFQmQ1qstfMXOTkvYk1Og4Q== 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=34IvAY3uJ5K4A66NHS+fVZHUyIZu0bPdqAIFENKbcKA=; b=LDUrE45trGAC4a5dClla3GhT+Di02KpyamKlDlRhsV1BfZyaeBGd0sM+LFKx4PJdX2Ida11iUWk+KJLWOlJcPxLTN1H1rdU8YfSGjHtm5i5G/Oj0RiQ5h8+N7yRoRWq0K1M5XIwgEsSXnqQadxsCZuQ90kfarO9Fd+Fqyynt1S0c7go9aO1WJ+Jhjx3FmdX9L0Y0C0ZVq/Rxd6dSqkwRhbUGggwWrWwIAyW6KHGWaGJ1o3VsqR0nKik861q4h+PgNI3cAnbUDhy+aKmyvE8ZoA1jhREET2m/tiaTfc+TUGxpTW6unU7ES6yi201c0e2yJX9+ymVH6H5qI1nWp+B16Q== Received: from DB5EUR03FT016.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e0a::51) by DB5EUR03HT059.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e0a::370) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.29; Wed, 7 Apr 2021 23:56:30 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0a::42) by DB5EUR03FT016.mail.protection.outlook.com (2a01:111:e400:7e0a::141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 23:56:30 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C8A834BDD4AF8E05F46718D49727A4596E848FEC436B4FE3EDBB52E637221149; UpperCasedChecksum:D842F1101142A0327869400E9D7BBC5B0F9ED3B9F4EB66DA4EE025FBC8E1B2E9; SizeAsReceived:7386; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Wed, 7 Apr 2021 23:56:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 01:56:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [KXzW5wYf32laxYiFQM/6YR5ft/g0u6cD] X-ClientProxiedBy: AM0PR02CA0005.eurprd02.prod.outlook.com (2603:10a6:208:3e::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210407235621.461159-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR02CA0005.eurprd02.prod.outlook.com (2603:10a6:208:3e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Wed, 7 Apr 2021 23:56:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: a750cce5-a4fe-4954-d727-08d8fa20c31e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQjNE6nzsV5f50Nzhg76defXY7BtgY6homMEYVFOSVUKFGXYs//hQKPQ1lsJ3BPIKuhjy/gClmSIJ7mTTTXJbM7VPSSRbPG16IgKc8stIGqBv+nt2A/f7yGYqeKAzyiBFc3iuSrCfNMXTr6JcWWWFEVayFpb+YjF43jxsf6FPn9cztla/L9T2Anj4HpXqjgDT6I7sANu2KvMmE3ZM3xu+COnOBvmDMch0nhOa2tI1pQQgT0CIwxCvM1kwLx4CWWs7H84sasOSSsS3lAItcKpXGIG4622NjrHYDLeOgjBO2Yw+PKA518B8FnQyeyKcbzhbkPnlplZx0/G86AP26QUtAyEPFiSXM1GwKiRLF0txhTx9c+3jD6jAFTp7CQSlZ32w0Qk9Fyw2QhfiVzSC4tQt4ND8MoYOJ7lIF7lBXpw7RKEIpVLu0JU9J3xHdnz0u3to/aUNm4m8ZHkASMZMsQM+sr9q6Q5Hjr3JPEa0KxZoDY4xeMcst9MTL7c37NWx9IezzIlO7+M7m4M3/ULtwily8tl4NpqNLFfo1hk0BUL7p9mfEFTvqvpjxGbNuI1JujdMNlHimVQI8DINkXQzRiuoenUoSsiKiLiyJKJUQspB8LUCPDxwKYp2YKflaPLU7cUqpYXkEvWlC3Dp4PvDo/14zcbckdSZfNcndCyjvVfitc+XQN9GGkBLoFRAxjmrft34p54AjsnPPJBg62sCPP8ljMx/yZRdOlLlnmzwpzoPrrtNKMuRNih50Tb9doS2+cKQU= X-MS-TrafficTypeDiagnostic: DB5EUR03HT059: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +B1AjO42ej4oWW7tCgqnOmFOuNEIp+XMj5SJ2jDCUqVJP1SR6q1TBs6H5xGrtEFwq510t3QwcCB/sksT03D50k34te5xyVtunm6ZWYe9leIY94jxVDikBUqgd/eDCq/2WtWLc07x58EGOZmjJmNA7hAvMuVroxMe4+LznkAMRo1Hc3K3uxmSRBQKkk1zs8nc2CtTH+8fhJQg95DB3Lfefo9uiRyln2Gc1q/ZC9djyC/1EyqWuelnTfbbdNfcj7GbADpoAf0hFMMMfDR+SOK+7r1eDqiBw1dC/BJHaIRgKeHZm4awSBzgLXDH7YWld4o1aImekN4ZXyRznN+LkBTmU8OxmLvdJt3X9Q8zsqSOMWX+kbjs1rOavcrN4oI1eBRidbyYGiLwiLy6GMKa2JNpww== X-MS-Exchange-AntiSpam-MessageData: ZmPwsYyNijyyS3a9zfGjoR4t80kkDEKTXl1rSiy39Y99gazAbPwUyFQtMgY+BpR2FKnx3kVEU4XhK8enm+P5oloPnPrLDg++9jYJrEgv/Ps7AoZ0u/zPQ1h5fTu/7zyKnAqDf+pkE/AcRymTbd3XBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a750cce5-a4fe-4954-d727-08d8fa20c31e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 23:56:29.7138 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT016.eop-EUR03.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: DB5EUR03HT059 Subject: [FFmpeg-devel] [PATCH] avcodec/vc1dec: Fix memleak upon allocation error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" ff_vc1_decode_init_alloc_tables() had one error path that forgot to free already allocated buffers; these would then be overwritten on the next allocation attempt (or they would just not be freed in case this happened during init, as the decoders for which it is used do not have the FF_CODEC_CAP_INIT_CLEANUP set). Signed-off-by: Andreas Rheinhardt --- Will apply this soon as it is quite easy and straightforward. libavcodec/vc1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index b702b76060..ea93e11588 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -384,7 +384,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) { for (i = 0; i < 4; i++) if (!(v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width))) - return AVERROR(ENOMEM); + goto error; } ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,