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

[channels,rdpsnd] terminate thread before free

Browse Source 
Ensure that the optional rdpsnd thread is terminated and the message
queue freed up before releasing the channel context memory
This commit is contained in:
akallabeth
2026-01-26 10:48:14 +01:00
parent 026b81ae58
commit 622bb7b440
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1278,11 +1278,29 @@ fail:
return CHANNEL_RC_NO_MEMORY;
}
static void rdpsnd_terminate_thread(rdpsndPlugin* rdpsnd)
{
WINPR_ASSERT(rdpsnd);
if (rdpsnd->queue)
MessageQueue_PostQuit(rdpsnd->queue, 0);
if (rdpsnd->thread)
{
(void)WaitForSingleObject(rdpsnd->thread, INFINITE);
(void)CloseHandle(rdpsnd->thread);
}
MessageQueue_Free(rdpsnd->queue);
rdpsnd->thread = NULL;
rdpsnd->queue = NULL;
}
static void cleanup_internals(rdpsndPlugin* rdpsnd)
{
if (!rdpsnd)
return;
rdpsnd_terminate_thread(rdpsnd);
if (rdpsnd->pool)
StreamPool_Return(rdpsnd->pool, rdpsnd->data_in);
@@ -1460,15 +1478,7 @@ void rdpsnd_virtual_channel_event_terminated(rdpsndPlugin* rdpsnd)
{
if (rdpsnd)
{
if (rdpsnd->queue)
MessageQueue_PostQuit(rdpsnd->queue, 0);
if (rdpsnd->thread)
{
(void)WaitForSingleObject(rdpsnd->thread, INFINITE);
(void)CloseHandle(rdpsnd->thread);
}
MessageQueue_Free(rdpsnd->queue);
rdpsnd_terminate_thread(rdpsnd);
free_internals(rdpsnd);
audio_formats_free(rdpsnd->fixed_format, 1);