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

server/proxy: set ps->thread to NULL on disconnect

Browse Source 
freerdp_abort_connect calls the proxy's client stop function,
that closes the thread handle. if it already closed by the server,
a segfault will occur because CloseHandle will try to access free()'ed
memory.
This commit is contained in:
kubistika 2019-06-11 18:54:10 +03:00 committed by akallabeth
parent 8a115f2020
commit 74a66f6651
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/proxy/pf_server.c
View File

@ -55,13 +55,10 @@
static void pf_server_handle_client_disconnection(freerdp_peer* client)
{
pServerContext* ps;
proxyData* pdata;
rdpContext* pc;
ps = (pServerContext*)client->context;
pc = (rdpContext*) ps->pdata->pc;
pdata = ps->pdata;
WLog_INFO(TAG, "Client %s disconnected; closing proxy's client <> target server connection %s",
pServerContext* ps = (pServerContext*)client->context;
rdpContext* pc = (rdpContext*) ps->pdata->pc;
proxyData* pdata = ps->pdata;
WLog_INFO(TAG, "Connection with %s was closed; closing proxy's client <> target server connection %s",
client->hostname, pc->settings->ServerHostname);
/* Mark connection closed for sContext */
SetEvent(pdata->connectionClosed);
@ -70,6 +67,7 @@ static void pf_server_handle_client_disconnection(freerdp_peer* client)
WLog_DBG(TAG, "Waiting for proxy's client thread to finish");
WaitForSingleObject(ps->thread, INFINITE);
CloseHandle(ps->thread);
ps->thread = NULL;
}
static BOOL pf_server_parse_target_from_routing_token(rdpContext* context,