From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30D36158086 for ; Sun, 24 Oct 2021 14:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D241E069C; Sun, 24 Oct 2021 14:29:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41ED2E069C for ; Sun, 24 Oct 2021 14:29:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6213343514 for ; Sun, 24 Oct 2021 14:29:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DD138F for ; Sun, 24 Oct 2021 14:29:44 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1635085757.99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch net-misc/freerdp/freerdp-2.4.1-r1.ebuild net-misc/freerdp/freerdp-2.4.1.ebuild X-VCS-Directories: net-misc/freerdp/files/ net-misc/freerdp/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960 X-VCS-Branch: master Date: Sun, 24 Oct 2021 14:29:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb705ced-5873-4b3a-ab84-f39c7ed04244 X-Archives-Hash: 708acfbc30971261517cd279e81226e1 commit: 99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960 Author: Mike Gilbert gentoo org> AuthorDate: Sun Oct 24 14:29:17 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Oct 24 14:29:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bd93a4 net-misc/freerdp: fix erroneous free() call Signed-off-by: Mike Gilbert gentoo.org> .../freerdp/files/freerdp-2.4.1-rdpei-free.patch | 27 ++++++++++++++++++++++ ...reerdp-2.4.1.ebuild => freerdp-2.4.1-r1.ebuild} | 4 ++++ 2 files changed, 31 insertions(+) diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch new file mode 100644 index 00000000000..d6e73631c6e --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch @@ -0,0 +1,27 @@ +From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 24 Oct 2021 10:04:38 -0400 +Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array + +This was fixed on master as part of +268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems +like too much for the stable branch. +--- + channels/rdpei/client/rdpei_main.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c +index f20d58a13..1d95054a0 100644 +--- a/channels/rdpei/client/rdpei_main.c ++++ b/channels/rdpei/client/rdpei_main.c +@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) + return CHANNEL_RC_OK; + error_out: + free(context); +- free(rdpei->contactPoints); + free(rdpei); + return error; + } +-- +2.33.1 + diff --git a/net-misc/freerdp/freerdp-2.4.1.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild similarity index 97% rename from net-misc/freerdp/freerdp-2.4.1.ebuild rename to net-misc/freerdp/freerdp-2.4.1-r1.ebuild index 30cd72a4a8d..79d2f82e834 100644 --- a/net-misc/freerdp/freerdp-2.4.1.ebuild +++ b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild @@ -88,6 +88,10 @@ BDEPEND=" ) ) " +PATCHES=( + "${FILESDIR}/freerdp-2.4.1-rdpei-free.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF)