github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rdpdr resource cleanup

Browse Source
This commit is contained in:
akallabeth 2022-06-22 13:01:28 +02:00 committed by akallabeth
parent de91cec5bf
commit e2acd03498
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
channels/rdpdr/client/rdpdr_main.c
View File

@ -1590,7 +1590,6 @@ static UINT rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s)
}
}
Stream_Free(s, TRUE);
return error;
}
@ -1690,7 +1689,6 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void*
return ERROR_INTERNAL_ERROR;
}
rdpdr->data_in = NULL;
Stream_SealLength(data_in);
Stream_SetPosition(data_in, 0);
@ -1699,6 +1697,7 @@ static UINT rdpdr_virtual_channel_event_data_received(rdpdrPlugin* rdpdr, void*
WLog_ERR(TAG, "MessageQueue_Post failed!");
return ERROR_INTERNAL_ERROR;
}
rdpdr->data_in = NULL;
}
return CHANNEL_RC_OK;
@ -1750,8 +1749,6 @@ static VOID VCAPITYPE rdpdr_virtual_channel_open_event_ex(LPVOID lpUserParam, DW
static DWORD WINAPI rdpdr_virtual_channel_client_thread(LPVOID arg)
{
wStream* data;
wMessage message;
rdpdrPlugin* rdpdr = (rdpdrPlugin*)arg;
UINT error;
@ -1775,6 +1772,7 @@ static DWORD WINAPI rdpdr_virtual_channel_client_thread(LPVOID arg)
while (1)
{
wMessage message = { 0 };
WINPR_ASSERT(rdpdr);
if (!MessageQueue_Wait(rdpdr->queue))
@ -1787,9 +1785,12 @@ static DWORD WINAPI rdpdr_virtual_channel_client_thread(LPVOID arg)
if (message.id == 0)
{
data = (wStream*)message.wParam;
wStream* data = (wStream*)message.wParam;
if ((error = rdpdr_process_receive(rdpdr, data)))
error = rdpdr_process_receive(rdpdr, data);
Stream_Free(data, TRUE);
if (error)
{
WLog_ERR(TAG, "rdpdr_process_receive failed with error %" PRIu32 "!", error);
@ -1886,9 +1887,9 @@ static UINT rdpdr_virtual_channel_event_disconnected(rdpdrPlugin* rdpdr)
}
}
MessageQueue_Free(rdpdr->queue);
if (rdpdr->thread)
CloseHandle(rdpdr->thread);
MessageQueue_Free(rdpdr->queue);
rdpdr->queue = NULL;
rdpdr->thread = NULL;

6
channels/rdpdr/server/rdpdr_main.c
View File

@ -1371,6 +1371,11 @@ static UINT rdpdr_server_stop(RdpdrServerContext* context)
context->priv->StopEvent = NULL;
}
if (context->priv->ChannelHandle)
{
WTSVirtualChannelClose(context->priv->ChannelHandle);
context->priv->ChannelHandle = NULL;
}
return CHANNEL_RC_OK;
}
@ -2721,6 +2726,7 @@ void rdpdr_server_context_free(RdpdrServerContext* context)
if (context->priv)
{
ListDictionary_Free(context->priv->IrpList);
free(context->priv->ClientComputerName);
free(context->priv);
}