morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12396 from akallabeth/reload-fix

Browse Source 
Reload fix missing null checks
This commit is contained in:
akallabeth
2026-02-28 11:01:07 +01:00
committed by GitHub
parent 7c405bf644 eb0aa95ca4
commit b6e37d2006
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libfreerdp/core/connection.c
View File

@@ -302,14 +302,13 @@ BOOL rdp_client_connect(rdpRdp* rdp)
{
UINT32 SelectedProtocol = 0;
BOOL status = 0;
rdpSettings* settings = nullptr;
/* make sure SSL is initialize for earlier enough for crypto, by taking advantage of winpr SSL
* FIPS flag for openssl initialization */
DWORD flags = WINPR_SSL_INIT_DEFAULT;
WINPR_ASSERT(rdp);
settings = rdp->settings;
rdpSettings* settings = rdp->settings;
WINPR_ASSERT(settings);
if (!rdp_client_reset_codecs(rdp->context))
@@ -318,7 +317,9 @@ BOOL rdp_client_connect(rdpRdp* rdp)
if (settings->FIPSMode)
flags |= WINPR_SSL_INIT_ENABLE_FIPS;
winpr_InitializeSSL(flags);
if (!winpr_InitializeSSL(flags))
return FALSE;
rdp_log_build_warnings(rdp);
/* FIPS Mode forces the following and overrides the following(by happening later */
@@ -353,6 +354,9 @@ BOOL rdp_client_connect(rdpRdp* rdp)
const UINT32 port = settings->ServerPort;
WINPR_ASSERT(port <= UINT32_MAX);
if (!rdp->nego)
return FALSE;
nego_init(rdp->nego);
nego_set_target(rdp->nego, hostname, (UINT16)port);
@@ -502,8 +506,11 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
if (!rdp_client_transition_to_state(rdp, CONNECTION_STATE_INITIAL))
return FALSE;
if (freerdp_channels_disconnect(context->channels, context->instance) != CHANNEL_RC_OK)
return FALSE;
if (context->channels)
{
if (freerdp_channels_disconnect(context->channels, context->instance) != CHANNEL_RC_OK)
return FALSE;
}
freerdp_client_codecs_free(context->codecs);
context->codecs = nullptr;

3
libfreerdp/core/freerdp.c
View File

@@ -643,7 +643,8 @@ BOOL freerdp_disconnect(freerdp* instance)
}
}
freerdp_channels_close(instance->context->channels, instance);
if (instance->context->channels)
freerdp_channels_close(instance->context->channels, instance);
IFCALL(instance->PostFinalDisconnect, instance);

14
libfreerdp/core/utils.c
View File

@@ -497,11 +497,17 @@ BOOL utils_reload_channels(rdpContext* context)
{
WINPR_ASSERT(context);
freerdp_channels_disconnect(context->channels, context->instance);
freerdp_channels_close(context->channels, context->instance);
freerdp_channels_free(context->channels);
if (context->channels)
{
freerdp_channels_disconnect(context->channels, context->instance);
freerdp_channels_close(context->channels, context->instance);
freerdp_channels_free(context->channels);
}
context->channels = freerdp_channels_new(context->instance);
WINPR_ASSERT(context->channels);
if (!context->channels)
return FALSE;
freerdp_channels_register_instance(context->channels, context->instance);
BOOL rc = TRUE;