From patchwork Sun Sep 26 06:40:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3046398iob; Sat, 25 Sep 2021 23:40:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYBEmqNIDR6fHYDKC4q22OyUdKtXZI8IBQAE34n+yEF3iwFa3Agk727cCxMxTchf5mjTZr X-Received: by 2002:a17:906:ae83:: with SMTP id md3mr9939566ejb.84.1632638446911; Sat, 25 Sep 2021 23:40:46 -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 x15si5812048ede.404.2021.09.25.23.40.46; Sat, 25 Sep 2021 23:40:46 -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=enRPqjMn; 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 E33D168A6A1; Sun, 26 Sep 2021 09:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070030.outbound.protection.outlook.com [40.92.70.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E04468A6A1 for ; Sun, 26 Sep 2021 09:40:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEl4tEMqj6jRQmftOQ8QUfl7Blnx8iB38PxfWhI6Nz8pNanf97IgQobQvzXfGxhvPDO7SKJfwwPH/5Ch+T4Ywr0Fg8nnkuw8mH7Rm/3vz6/a5OlIJm28+PXC55AfkByz00igdaeTTbv0wMxQiLAZK7Y3JNELr19obkMS2d2wRQaJJRqRDgZ4w9QO0R3JNbRONOFpPFbRknZPhglsxzhfvch73SAxdFMLxVTxsyLnq3D8dBaMxffsXJFQu0Rwiw4I59PaEyPQrfQBnK2/m83OH8XNqYThP/u9zMig7RDqlAD2EUZK/xp9QnigHqIgOIyiFtGPWXHBIfX/AOEsVJF73g== 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; bh=unPTq4WUo7ADEa2abxhC7/cZbPo9BIwkMKUnTxrsy14=; b=lGvDdJglsd+j9/5qf0jvRcPwBSVW2Q1WCuxOzJAphbI4HPCikXVOLnyxNF29TXujrlAU1wvKXpeOJcBk2bCTum0BUmpCDnBKc9VwxiFrJcvLV1SOjZKbq6r2aRUmqm2iGCTtsRSpNxk4t03cBp+zq8SsxaHTidPoJWRqsWie4q0zWB7NZb5pR4YiK8BMxJEWQDwjTi/3TkNUT2/G7H9W9adlqyvK+7HMGxFwrnMA6lJWOWNRG10opH+Z8y02aPU2YXBx8HLtz8q51XbQw2hfjwA7aioXPnS/f8SuKrY2d5N8E7QjDrYPIBCgaGn1F8IVxjNruneFAzUrcnm+tw6fsg== 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=unPTq4WUo7ADEa2abxhC7/cZbPo9BIwkMKUnTxrsy14=; b=enRPqjMn/zAgrS85g3tZsJ/uiUGxshcXQs7xZ2Ab6aesGt1iiyMG9uwWy54NcD9YhiXdrsYBHZfMZxHSk3HV0NYypzlF6Xw9rccgadNRGSyWgyAkBcG3opXJmhTwxELKP/WTMxF9X7qes73Yu1yJCiAnaIxyEgvy7m2WhyhdvTs/Q2aK/WgwD7NLOf881eUZtywjubS0CHZ9BX1OuoelMU6W+HANKSdq2oaII1CRTeyscFc6RRK4nZ5TE75Bepg6ViZUjuvrksghYGSiVG47BHwsAM0HXF5xwuFpzHlPkvcqMyYageWmA8mptlR7XRXm7FvZhJUfoCox5ylWyx0cMA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.16; Sun, 26 Sep 2021 06:40:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Sun, 26 Sep 2021 06:40:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Sep 2021 08:40:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tm1fz5b9yvom3Sv3MHNF9FB9GUfEeUK+] X-ClientProxiedBy: AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210926064027.344398-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14 via Frontend Transport; Sun, 26 Sep 2021 06:40:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b508afe9-77ec-4ce8-9b42-08d980b88bb2 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3U/DR4NyBZ4rqa2NklQwVm3uwq23uRFxtyZspCwSXAylhSIm5dPtyJAzavpH3+xVughV2WUrQYLnM8Ug85zQ+Q9zWYeoVu2j+W02/k8vgeAPUHjQX3FPsZQBtrQDrg9coa/4MxYCtzvsxjXNuoN9SIbZovK5fgqZqC4wZzPMjGNNyZUE6f2mdF0G+kZkzCV2AYK7ubJ++Y7tFLrhsct6OcPQJSjm/PWFTbb2X4vY/yVHmHBOJ46MYQDE3F7RzOW9t8CJHgCXJzCV+HDgOnTh7qC2HsQg0lhahUNcySM7ysTijhV4QVXQX/1SoSIJY3jxuvWAE9+A+2s0VXLVPudaH4hrROl8QuDkvbBBX0kQBIWl3e6pUHh+eNmv4gG7LsdcTurQ79/BlYo0KcV2I/J2gGkwIWZQcksbldTLodeDMg40pEbt/czoMTyGLcnKfHyr2zBEYQAPZ4GsIK52ANQCLFpHTF66HL7K+4scupZb3uqh/q+/A+LxUeFNUD8SEOxC0MiQCGlDIV1HjW0PgShl8niz2Kc+7TTj1ylWJVK2hirO2g6d+Rpo9rePeAmZJtZ4YlaHswe8Kru88aX3JnOfyEGOIyiHaqCWRc7t0jQ+gn8Z9Ob4TkIND2HeWGGuZZki50QFSb+Df+Uo93xwsJp+1xlP5BoIBdeV69qL4adomeVbBFT9pHNDt4YqEr0B9JT6sf/33lQmoDAc4r9P2MA3LmvUyxmuAixa88= X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: whyiA8xHibUq0+y1HyrhjPzuRy3pFTZWHmzebUx9B0TYe4aY1y+mwGzypKy0xNJGRx5UarYLl/I2DUHZcMNrNt/h6RIYTP9sFpTamXg0OJDOqneS77H4Q1zsumdYTlBK/t14qs7vFS03D+ukvfi6DI9MSYcCMPYpmbq48Pe/ra1VbkBvWtoJd0kCU9tDRiKFK6IRT9CxTIQ+tqjufexvN3vbZyiyh1f55LvPHSFIlyO40vvAVfW8EmsMyYRQwCMTF9dbp8nkbUPiyWKFaz/i4HEZ3nf5A000AswjTXMREMhIrNSrEGyzQ/8p3k7HqFy0CYRJBJHvLB9MFnd+nPfqeej3QPRzCzD/IK8RyWM5ZFPxDVN+Lkk0HRSi+Hwg4gHlKz8dM+Em6lZx5lUiImFIt+PzEUQb935acsdqNIqXaK3tGM/sF1aOXHWR7cfgWriX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m+TyZrd16MFgAB4WyNKpvQsUv6uXD+zh6v6o0rQ7vwauJ7nzVfFYoJCUIarjCsgrX7MKsVJZgrBBsPL6ZL9cKoVhGFH+yzdEO2B5IUKg3nBs8lzk6jeGg7SjKODnW2MK4OAK/Isyb4I3CILldbF/mg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b508afe9-77ec-4ce8-9b42-08d980b88bb2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2021 06:40:35.7822 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/qsvenc: Fix leak of A53 data 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: phRy9JCgNjIL Up until now, it has only been freed when the QSVFrame is reused, so that the last one contained in it leaked at the end. Signed-off-by: Andreas Rheinhardt --- libavcodec/qsvenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 66f79bb021..e5d09752cb 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1612,6 +1612,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) while (cur) { q->work_frames = cur->next; av_frame_free(&cur->frame); + free_encoder_ctrl_payloads(&cur->enc_ctrl); av_freep(&cur); cur = q->work_frames; }