commit: 273f561c07735891c90aca6b371ba9ac96ed3d0a Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Aug 11 15:03:22 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Aug 11 15:04:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273f561c
net-misc/freerdp: fix TestUnicodeConversion on big endian machines Closes: https://bugs.gentoo.org/806995 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ...dp-2.4.0-TestUnicodeConversion-big-endian.patch | 28 ++++++++++++++++++++++ net-misc/freerdp/freerdp-2.3.2.ebuild | 1 + net-misc/freerdp/freerdp-2.4.0.ebuild | 1 + 3 files changed, 30 insertions(+) diff --git a/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch new file mode 100644 index 00000000000..b8977aecd56 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch @@ -0,0 +1,28 @@ +From 7f53e1c6c8503e9d3966c96bd403573f44879b0c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Sat, 7 Aug 2021 21:49:12 -0400 +Subject: [PATCH] Fix TestUnicodeConversion on big endian machines + +Wide character literals are stored in native byte order. +Use an array of bytes as a reference instead. + +Fixes: https://github.com/FreeRDP/FreeRDP/issues/6968 +--- + winpr/libwinpr/crt/test/TestUnicodeConversion.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +index 3bc9c245181..cc2a2597dd8 100644 +--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c ++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +@@ -403,8 +403,8 @@ static BOOL test_ConvertToUnicode_wrapper(void) + /* Test static string buffers of differing sizes */ + { + char name[] = "someteststring"; +- const WCHAR cmp[] = { L's', L'o', L'm', L'e', L't', L'e', L's', L't', +- L's', L't', L'r', L'i', L'n', L'g', 0 }; ++ const BYTE cmp[] = { 's', 0, 'o', 0, 'm', 0, 'e', 0, 't', 0, 'e', 0, 's', 0, 't', 0, ++ 's', 0, 't', 0, 'r', 0, 'i', 0, 'n', 0, 'g', 0, 0, 0 }; + WCHAR xname[128] = { 0 }; + LPWSTR aname = NULL; + LPWSTR wname = &xname[0]; diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild index 2aa7099751a..ca45e00a93e 100644 --- a/net-misc/freerdp/freerdp-2.3.2.ebuild +++ b/net-misc/freerdp/freerdp-2.3.2.ebuild @@ -90,6 +90,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/freerdp-2-openssl-3.0.patch" + "${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch" ) src_configure() { diff --git a/net-misc/freerdp/freerdp-2.4.0.ebuild b/net-misc/freerdp/freerdp-2.4.0.ebuild index c08a85f6d05..9a213eb7db2 100644 --- a/net-misc/freerdp/freerdp-2.4.0.ebuild +++ b/net-misc/freerdp/freerdp-2.4.0.ebuild @@ -90,6 +90,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/freerdp-2-openssl-3.0.patch" + "${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch" ) src_configure() {
