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

Merge pull request #2350 from giox069/master

Browse Source 
Fix freerdp_channels_free for clients with multiple active connections
This commit is contained in:
Marc-André Moreau 2015-02-04 11:27:41 -05:00
commit 4af1261132
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libfreerdp/core/client.c
View File

@ -100,6 +100,8 @@ void freerdp_channels_free(rdpChannels* channels)
{
int index;
CHANNEL_OPEN_DATA* pChannelOpenData;
ULONG_PTR* pKeys;
int nkeys;
if (channels->queue)
{
@ -116,14 +118,20 @@ void freerdp_channels_free(rdpChannels* channels)
free(pChannelOpenData->pInterface);
pChannelOpenData->pInterface = NULL;
}
HashTable_Remove(g_OpenHandles, (void*) (UINT_PTR)pChannelOpenData->OpenHandle);
}
if (g_OpenHandles)
{
HashTable_Free(g_OpenHandles);
DeleteCriticalSection(&g_channels_lock);
g_OpenHandles = NULL;
nkeys = HashTable_GetKeys(g_OpenHandles, &pKeys);
free(pKeys);
if ( nkeys == 0 ) {
HashTable_Free(g_OpenHandles);
DeleteCriticalSection(&g_channels_lock);
g_OpenHandles = NULL;
}
}
free(channels);