mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[proxy] fix possible NULL crash on shutdown

This commit is contained in:
akallabeth 2023-01-12 10:40:41 +01:00 committed by David Fort
parent 6d7c07076d
commit 08a2d61d6d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/proxy/pf_server.c
View File

@ -1035,16 +1035,19 @@ void pf_server_free(proxyServer* server)
pf_server_stop(server);
while (ArrayList_Count(server->peer_list) > 0)
if (server->peer_list)
{
/* pf_server_stop triggers the threads to shut down.
* loop here until all of them stopped.
*
* This must be done before ArrayList_Free otherwise the thread removal
* in pf_server_handle_peer will deadlock due to both threads trying to
* lock the list.
*/
Sleep(100);
while (ArrayList_Count(server->peer_list) > 0)
{
/* pf_server_stop triggers the threads to shut down.
* loop here until all of them stopped.
*
* This must be done before ArrayList_Free otherwise the thread removal
* in pf_server_handle_peer will deadlock due to both threads trying to
* lock the list.
*/
Sleep(100);
}
}
ArrayList_Free(server->peer_list);
freerdp_listener_free(server->listener);