diff options
author | Mike Gilbert <floppym@gentoo.org> | 2021-10-24 10:29:17 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2021-10-24 10:29:17 -0400 |
commit | 99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960 (patch) | |
tree | d35b73872a8bd23c86e4f561a4c665c0810e37a0 /net-misc | |
parent | dev-libs/libpcre2: fix incorrect detection of alternatives (diff) | |
download | gentoo-99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960.tar.gz gentoo-99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960.tar.bz2 gentoo-99bd93a4edf817bb1f8ccdc1fb91b3fd5663e960.zip |
net-misc/freerdp: fix erroneous free() call
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch | 27 | ||||
-rw-r--r-- | net-misc/freerdp/freerdp-2.4.1-r1.ebuild (renamed from net-misc/freerdp/freerdp-2.4.1.ebuild) | 4 |
2 files changed, 31 insertions, 0 deletions
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 000000000000..d6e73631c6e2 --- /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 <floppym@gentoo.org> +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 index 30cd72a4a8d7..79d2f82e8349 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) |