mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: fix crash on failed redirect

Browse Source
This commit is contained in:
Marc-André Moreau 2014-12-03 11:48:27 -05:00
parent 6ccce86140
commit 01ac15a879
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/X11/xf_client.c
View File

@ -1617,7 +1617,6 @@ void* xf_thread(void *param)
if (!exit_code) if (!exit_code)
exit_code = freerdp_error_info(instance); exit_code = freerdp_error_info(instance);
freerdp_channels_free(channels);
freerdp_disconnect(instance); freerdp_disconnect(instance);
gdi_free(instance); gdi_free(instance);
@ -1796,6 +1795,12 @@ static void xfreerdp_client_free(freerdp* instance, rdpContext* context)
if (xfc->display) if (xfc->display)
XCloseDisplay(xfc->display); XCloseDisplay(xfc->display);
if (context->channels)
{
freerdp_channels_free(context->channels);
context->channels = NULL;
}
} }
} }

11
libfreerdp/core/settings.c
View File

@ -519,6 +519,17 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
_settings->LoadBalanceInfo = NULL; _settings->LoadBalanceInfo = NULL;
_settings->LoadBalanceInfoLength = 0; _settings->LoadBalanceInfoLength = 0;
_settings->TargetNetAddress = NULL;
_settings->RedirectionTargetFQDN = NULL;
_settings->RedirectionTargetNetBiosName = NULL;
_settings->RedirectionUsername = NULL;
_settings->RedirectionDomain = NULL;
_settings->RedirectionPassword = NULL;
_settings->RedirectionPasswordLength = 0;
_settings->RedirectionTsvUrl = NULL;
_settings->RedirectionTsvUrlLength = 0;
_settings->TargetNetAddressCount = 0;
_settings->TargetNetAddresses = NULL;
if (settings->LoadBalanceInfo && settings->LoadBalanceInfoLength) if (settings->LoadBalanceInfo && settings->LoadBalanceInfoLength)
{ {