From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2AFDB46ADA for ; Mon, 2 Oct 2023 18:12:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D40B868CC22; Mon, 2 Oct 2023 21:12:46 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2081.outbound.protection.outlook.com [40.92.59.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B42F68CBFB for ; Mon, 2 Oct 2023 21:12:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gZZq+tP9yuDs8iF7V6OZ+9nh1tvuswnIkNV97+Z8O7xVxPO4NZOnAhvQODcxSbD/0CHyLlrk9uXJr6GHuh9vechF1B3BMYi1M+nZDnRgjQdK7AQVKAM9aS9W/Wt7gv1NCkiGd7L2VXXCPcd5fdXNLMf0szTaXKEXQcBW23vVoBdOoV9j10WLK0gHdH+tBpFQ20Z73hrmFeN04lUqgYSZcOrkQ383Q0MQFoU/TvAqQMdGW0FU1/6pXqeiW/p3CfwmpQEbUwnYS+WFITyqkz1Sm/YuZV6w2+ztq4YqGpuuyWW932XKOZOLODE6C2v30/dhGfQQT2GnfyODf3lNac6anA== 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=TyTwDrBkaLYOdlsHrQPSQpexkurk0Q1EZrX4pQGOGZI=; b=c5qYPhefnYUDbsx2aluyrD6XuJy7g37w02nlRGYSxROxmWB00sRuJi3NohtXCnq/dcfXt3gUl4rzKQjqf5afae4N4rnu3DnNMCFqBGp1vaBwVO9dIEBGWrAHs861z1nmiQmlSco8kpQNSt0jTi0OzWymu2iMnYusCfMq1MKpvJjecjc0wFOkNTpDIFCgFHiryTVl0XjClAUhSROk5U2je4NGNepdDX4cZ4cE0I+GHV+qLSr2PZEJ1VLBYK6kWGiRreEIM1jZDXvzZb7scsDrW/2iYDVsn79ULpDItUdSyZLKkYwVALmubQyGkXG83IvF90zn8uyHfGHG+u/XP5rzcw== 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=TyTwDrBkaLYOdlsHrQPSQpexkurk0Q1EZrX4pQGOGZI=; b=KtqPjkyMu2bNEWZ0bhme/3iKJGoanmdi1FQDTjmYrJhVhDh7b6QCppSKgIMiAgfU07R7JXTT0JBFLClgFhsrzR23J9foyZrNWOYd7+wtKB8xvO5giI2y42WE5y5FbCyGKfwPPjrwjXud3KPDiinEZZMMgNdYwRuEsCAcJNgKrVUKuBkI/zUgZCawY+8+QIcYmYGAe5hJnpzMFES+NHeMsRMK3Gw4cziRI7HZRnikDGLgnM49867TEv5Kqr2+607LcYRMYpRuqK8RVOb/PZyZbxJyWhuGqwdBqJvHBSo3LAkElkgRl9T3P3BoGpgGgnrsJQgpHy5u5eRZ+v2DYIyicQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0218.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Mon, 2 Oct 2023 18:12:39 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Mon, 2 Oct 2023 18:12:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Oct 2023 20:13:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [17cBhuBmRndoy5NEwGv04XFDNd6JGjMJ] X-ClientProxiedBy: ZR0P278CA0087.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231002181338.1030463-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0218:EE_ X-MS-Office365-Filtering-Correlation-Id: 6003bf90-52c5-4e5e-c9f9-08dbc37329a7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7+tYbk40SFU0UGwvqyguZwP4FtmEoHKK2BujEEf+cYc1xlTxHjFlOznyRG/p1RPGNLJqm0P0CraZJA8RNkAnLeadCQpu995iop7NN1183vzzaPJXXbNyzs9mHy0R4vEhUdJzPYOk2BfBgOxhb2FIY+U8IUxLU+VUGebskkt+N62y/h0zVcNSXVskF1tWYshnenv48U7E8/QMFkPIBZg98e44tclf7NUEx/3hbiEA2/WoDuEwXejO5Ms1twnQc1qUzxj5aVX8fRQy9DL9TyM3Q2G8WbiuIsbW5lWZzjik+ulsoaOCp5kcZgNfR2qqOSMm66cZAIUHBQemilaESajz20ce6VijOPG6xN708CaGjPvqbVDWdznamx66DT0Q8iQPhEk2d7J37FrsAjeS4XxkLpxQu7UUcdpogYa0IWVSAn4VGYBLs5sJKbeapFnB7uP97eALXdXrSjirOGIVN05gktXNhsa5EiOYvMiEY1NSGs2tyeF3kzfIsMU8+ciWY4Ia3vxnsZMuX5GvgG/mkkKqH/yuc8NIMXFzxil8lmW6XtvEuNZALLroToDY02i96n0qf1QUzNvJv1YF0Of18HA9UtFJeOv1JOFBoNK6rEJJGKfRfhm3UAB5U7DJKhJYyUYY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ztdB1S2Lczig+PoMZAoovY+Z4ct8+29UmfDncdQqk7SxcPM/dWkKNo2zKMq9?= =?us-ascii?Q?EwZv2MaGSZOrChHb7WiPhFpBRvLOTqqoGLuYkLXSGD0mUDcAToOrwJ+5KGx+?= =?us-ascii?Q?+UNNCPVgzy0KzL9Ic1kvKrJvMYrii9Req/583g3Ee7mP7raMT2vun2aM8Tqk?= =?us-ascii?Q?Q0OFL2cmSvfc1iAz3yKYRxWER5LLlJcviaAhC/6cTIyIPT4AFFbsrSgzldCA?= =?us-ascii?Q?XtLjtp1q6V2mE/ERzPzNMFegkC3grSt4ROX/uAZtKQaRZ4Z0Yo2MTAHp4cPg?= =?us-ascii?Q?L6GEj4qhbYCCmjvPxzg/k19SagINoKgQNLGB3N2Tjd/BRkIQ/rqkM8DN1RVK?= =?us-ascii?Q?/oLwUGbSnsHFusQA7XjhsYmDNDKmL1MESVajWDF8mDyoCWmCWyUTsSlXG7mZ?= =?us-ascii?Q?pi//lDMX4tzx9hvzBiThH+ZfAVvBQvkXpKDvmYBIE9b40KU7aN94Y9QOBif2?= =?us-ascii?Q?wagE5GE1mb3pUx+5thZh+JMJtkFPJvTagorE1rLxMw3pypalVo3fDsOJfWvl?= =?us-ascii?Q?fIz7jQ3R4SwxCjeZjTkXlIEw8BMlFxTLpw2OUs+LGe5hNacqBc275EasDIJD?= =?us-ascii?Q?sAAnE4FVKp2nihuVEWbT10DQubOCpG30IQd/XKKDZq7pkKJh3iMVnZSTRxGW?= =?us-ascii?Q?muXCDQa0DczwBGKaBAdjRr6ibqvgHu4YJjqzNbmCQH7txPWU45P9t8do7jzs?= =?us-ascii?Q?bNUs5usNJvtUIC4OzlDJ24rJzMF9pYcNonYP9jrH5+rTEZSaY2Lf7xi3b6Gq?= =?us-ascii?Q?vv82oL7OXyOnJHR57jgJCPxYJmXG96HY1FkgbcMN8Rm8LCwVmy+LgM6du20l?= =?us-ascii?Q?+xtIoZgiBowIpru04aOgHElA5HtwSAX8g4R5tCvptrgJQ9RN7mw6sf6o3Ju4?= =?us-ascii?Q?ng9VY/gYb/f8q/LM8gaWhX2TeHfdE48pQOS849p8yJ9ZJR/LC9H2C/uze/Ci?= =?us-ascii?Q?/sGmL0hTR1hsVdRTjt1xdcnR4UofPVEJiFbCfmuCa9HdggQHNccAsDba9dsD?= =?us-ascii?Q?Ysd/v86eoLGxtPU0Gno1vKqFAXZMGx4DzO9gBTU9OlFnLWK3Agy4i4KxA0z/?= =?us-ascii?Q?F/HXaqy5ixDy8WgKzNr2E4OK5cpo7PowiuhEZnrV/O5aroeBfZlRGv+OxnmO?= =?us-ascii?Q?F/zv0+h41PuDlrIooGAhR69fR7Ok8sz/Ad8lkJb37+/Niq/TaXPAaXwtVIDt?= =?us-ascii?Q?LXpqe6gS690ruygcvo4xjcO/DByg3I32gPnFYKVnkuF44tNNroaHw3gDR8Tt?= =?us-ascii?Q?7HU3qrcUsSFZ6LdFrX5y?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6003bf90-52c5-4e5e-c9f9-08dbc37329a7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 18:12:39.3650 (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: AS8P250MB0218 Subject: [FFmpeg-devel] [PATCH 44/49] avcodec/rkmppdec: Fix double-free on 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: After having created the AVBuffer that is put into frame->buf[0], ownership of several objects (namely an AVDRMFrameDescriptor, an MppFrame and some AVBufferRefs framecontextref and decoder_ref) has passed to the AVBuffer and therefore to the frame. Yet it has nevertheless been freed manually on error afterwards, which would lead to a double-free as soon as the AVFrame is unreferenced. Signed-off-by: Andreas Rheinhardt --- I hope we have a maintainer (or anyone else) for this who can test these patches. libavcodec/rkmppdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 5768568b00..2ca368e0a9 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -462,8 +462,8 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame) frame->hw_frames_ctx = av_buffer_ref(decoder->frames_ref); if (!frame->hw_frames_ctx) { - ret = AVERROR(ENOMEM); - goto fail; + av_frame_unref(frame); + return AVERROR(ENOMEM); } return 0; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".