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

[channels,rdpsnd] fix rdpsnd channel cleanup

Browse Source 
The rdpsnd channel needs to keep the resources allocated until the last
user (static, dynamic channel) is terminated.
This commit is contained in:
akallabeth 2022-12-13 10:35:27 +01:00 committed by Martin Fleisz
parent b41ef0cda7
commit babc47e19c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/drdynvc/client/drdynvc_main.c
View File

@ -520,8 +520,8 @@ static void dvcman_free(drdynvcPlugin* drdynvc, IWTSVirtualChannelManager* pChan
WINPR_ASSERT(dvcman);
WINPR_UNUSED(drdynvc);
ArrayList_Free(dvcman->plugins);
HashTable_Free(dvcman->channelsById);
ArrayList_Free(dvcman->plugins);
ArrayList_Free(dvcman->plugin_names);
HashTable_Free(dvcman->listeners);

11
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -110,6 +110,8 @@ struct rdpsnd_plugin
UINT16 wVersion;
UINT32 volume;
BOOL applyVolume;
size_t references;
};
static const char* rdpsnd_is_dyn_str(BOOL dynamic)
@ -1318,6 +1320,12 @@ static void free_internals(rdpsndPlugin* rdpsnd)
if (!rdpsnd)
return;
if (rdpsnd->references > 0)
rdpsnd->references--;
if (rdpsnd->references > 0)
return;
freerdp_dsp_context_free(rdpsnd->dsp_context);
StreamPool_Free(rdpsnd->pool);
rdpsnd->pool = NULL;
@ -1341,6 +1349,7 @@ static BOOL allocate_internals(rdpsndPlugin* rdpsnd)
if (!rdpsnd->dsp_context)
return FALSE;
}
rdpsnd->references++;
return TRUE;
}
@ -1666,7 +1675,7 @@ static UINT rdpsnd_on_new_channel_connection(IWTSListenerCallback* pListenerCall
callback->channel_mgr = listener_callback->channel_mgr;
callback->channel = pChannel;
listener_callback->channel_callback = callback;
*ppCallback = (IWTSVirtualChannelCallback*)callback;
*ppCallback = &callback->iface;
return CHANNEL_RC_OK;
}