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

libfreerdp-core: fix rdg event handles

Browse Source
This commit is contained in:
Marc-André Moreau 2015-03-17 15:13:11 -04:00
parent bdf17450e5
commit 360e2c5e4e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libfreerdp/core/gateway/rdg.c
View File

@ -59,7 +59,7 @@ BOOL rdg_write_packet(rdpRdg* rdg, wStream* sPacket)
char chunkSize[11]; char chunkSize[11];
int status; int status;
sprintf(chunkSize, "%X\r\n", Stream_Length(sPacket)); sprintf_s(chunkSize, sizeof(chunkSize), "%X\r\n", (unsigned int) Stream_Length(sPacket));
sChunk = Stream_New(NULL, strlen(chunkSize) + Stream_Length(sPacket) + 2); sChunk = Stream_New(NULL, strlen(chunkSize) + Stream_Length(sPacket) + 2);
if (!sChunk) if (!sChunk)
{ {
@ -492,7 +492,6 @@ BOOL rdg_process_handshake_response(rdpRdg* rdg, wStream* s)
BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s) BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s)
{ {
HRESULT errorCode; HRESULT errorCode;
UINT16 fieldsPresent = 0;
WLog_WARN(TAG, "Tunnel response received"); WLog_WARN(TAG, "Tunnel response received");
@ -516,7 +515,6 @@ BOOL rdg_process_tunnel_response(rdpRdg* rdg, wStream* s)
BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s) BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s)
{ {
HRESULT errorCode; HRESULT errorCode;
UINT16 fieldsPresent = 0;
WLog_WARN(TAG, "Tunnel authorization response received"); WLog_WARN(TAG, "Tunnel authorization response received");
@ -540,7 +538,6 @@ BOOL rdg_process_tunnel_authorization_response(rdpRdg* rdg, wStream* s)
BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s) BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s)
{ {
HRESULT errorCode; HRESULT errorCode;
UINT16 fieldsPresent = 0;
WLog_WARN(TAG, "Channel create response received"); WLog_WARN(TAG, "Channel create response received");
@ -678,14 +675,14 @@ UINT32 rdg_get_event_handles(rdpRdg* rdg, HANDLE* events)
events[nCount] = rdg->readEvent; events[nCount] = rdg->readEvent;
nCount++; nCount++;
if (rdg->tlsOut) if (rdg->tlsOut && rdg->tlsOut->bio)
{ {
if (events) if (events)
BIO_get_event(rdg->tlsOut->bio, &events[nCount]); BIO_get_event(rdg->tlsOut->bio, &events[nCount]);
nCount++; nCount++;
} }
if (rdg->tlsIn) if (rdg->tlsIn && rdg->tlsIn->bio)
{ {
if (events) if (events)
BIO_get_event(rdg->tlsIn->bio, &events[nCount]); BIO_get_event(rdg->tlsIn->bio, &events[nCount]);
@ -1448,7 +1445,7 @@ rdpRdg* rdg_new(rdpTransport* transport)
} }
rdg->frontBio->ptr = rdg; rdg->frontBio->ptr = rdg;
rdg->readEvent = CreateEvent(NULL, FALSE, FALSE, NULL); rdg->readEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (!rdg->readEvent) if (!rdg->readEvent)
{ {
goto rdg_alloc_error; goto rdg_alloc_error;