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

Proxy client cleanups 

* Use proper maximum handle defines
* Gracefully handle out of memory instead of assert
This commit is contained in:
Armin Novak 2021-09-07 08:09:36 +02:00 committed by akallabeth
parent 4e44003832
commit 4cc0fbca33
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
server/proxy/pf_client.c
View File

@ -688,7 +688,7 @@ static DWORD WINAPI pf_client_thread_proc(LPVOID arg)
proxyData* pdata;
DWORD nCount = 0;
DWORD status;
HANDLE handles[65] = { 0 };
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
WINPR_ASSERT(instance);
pc = (pClientContext*)instance->context;
@ -822,28 +822,6 @@ static int pf_client_verify_X509_certificate(freerdp* instance, const BYTE* data
return 1;
}
static void* channel_data_copy(const void* obj)
{
const proxyChannelDataEventInfo* src = obj;
proxyChannelDataEventInfo* dst;
WINPR_ASSERT(src);
dst = calloc(1, sizeof(proxyChannelDataEventInfo));
WINPR_ASSERT(dst);
*dst = *src;
if (src->channel_name)
{
dst->channel_name = _strdup(src->channel_name);
WINPR_ASSERT(dst->channel_name);
}
dst->data = malloc(src->data_len);
WINPR_ASSERT(dst->data);
memcpy((void*)dst->data, src->data, src->data_len);
return dst;
}
static void channel_data_free(void* obj)
{
proxyChannelDataEventInfo* dst = obj;
@ -855,6 +833,35 @@ static void channel_data_free(void* obj)
}
}
static void* channel_data_copy(const void* obj)
{
const proxyChannelDataEventInfo* src = obj;
proxyChannelDataEventInfo* dst;
WINPR_ASSERT(src);
dst = calloc(1, sizeof(proxyChannelDataEventInfo));
if (!dst)
goto fail;
*dst = *src;
if (src->channel_name)
{
dst->channel_name = _strdup(src->channel_name);
if (!dst->channel_name)
goto fail;
}
dst->data = malloc(src->data_len);
if (!dst->data)
goto fail;
memcpy((void*)dst->data, src->data, src->data_len);
return dst;
fail:
channel_data_free(dst);
return NULL;
}
static BOOL pf_client_client_new(freerdp* instance, rdpContext* context)
{
wObject* obj;