From 2e4948c38c464f1d29f9ba2fe4a2935672c522ee Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Tue, 19 May 2015 15:13:32 +0200 Subject: [PATCH] Make remdesk_virtual_channel_write() static The function with the same name is defined in multiple libraries (libfreerdp-shadow.so, libfreerdp-server.so), which might confuse the dynamic linker at runtime, binding a wrong version of the function and thus causing segmentation faults. Since remdesk_virtual_channel_write()s aren't used outside the files they are defined in, we can declare them static to make them invisible to the linker. --- channels/remdesk/client/remdesk_main.c | 2 +- channels/remdesk/server/remdesk_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/remdesk/client/remdesk_main.c b/channels/remdesk/client/remdesk_main.c index 53ea9eb5a..7df6d634e 100644 --- a/channels/remdesk/client/remdesk_main.c +++ b/channels/remdesk/client/remdesk_main.c @@ -38,7 +38,7 @@ RemdeskClientContext* remdesk_get_client_interface(remdeskPlugin* remdesk) return pInterface; } -int remdesk_virtual_channel_write(remdeskPlugin* remdesk, wStream* s) +static int remdesk_virtual_channel_write(remdeskPlugin* remdesk, wStream* s) { UINT32 status = 0; diff --git a/channels/remdesk/server/remdesk_main.c b/channels/remdesk/server/remdesk_main.c index fa4bde6af..51d276ad3 100644 --- a/channels/remdesk/server/remdesk_main.c +++ b/channels/remdesk/server/remdesk_main.c @@ -27,7 +27,7 @@ #include "remdesk_main.h" -int remdesk_virtual_channel_write(RemdeskServerContext* context, wStream* s) +static int remdesk_virtual_channel_write(RemdeskServerContext* context, wStream* s) { BOOL status; ULONG BytesWritten = 0;