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

Relax transport checks, allow invalid socket

Browse Source 
When no real RDP connection is in use, the SSL socket might be invalid.
Do not assert here but allow the parsing to continue
This commit is contained in:
Armin Novak 2022-10-10 11:55:17 +02:00 committed by akallabeth
parent b4dbdac68b
commit 71b568ac30
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libfreerdp/core/transport.c
View File

@ -163,24 +163,34 @@ static BOOL transport_default_attach(rdpTransport* transport, int sockfd)
const rdpSettings* settings;
rdpContext* context = transport_get_context(transport);
if (sockfd < 0)
{
WLog_WARN(TAG, "Running peer without socket (sockfd=%d)", sockfd);
return TRUE;
}
settings = context->settings;
WINPR_ASSERT(settings);
if (!freerdp_tcp_set_keep_alive_mode(settings, sockfd))
goto fail;
if (sockfd >= 0)
{
if (!freerdp_tcp_set_keep_alive_mode(settings, sockfd))
goto fail;
socketBio = BIO_new(BIO_s_simple_socket());
socketBio = BIO_new(BIO_s_simple_socket());
if (!socketBio)
goto fail;
if (!socketBio)
goto fail;
BIO_set_fd(socketBio, sockfd, BIO_CLOSE);
}
BIO_set_fd(socketBio, sockfd, BIO_CLOSE);
bufferedBio = BIO_new(BIO_s_buffered_socket());
if (!bufferedBio)
goto fail;
bufferedBio = BIO_push(bufferedBio, socketBio);
if (socketBio)
bufferedBio = BIO_push(bufferedBio, socketBio);
WINPR_ASSERT(bufferedBio);
transport->frontBio = bufferedBio;
return TRUE;
@ -1193,9 +1203,11 @@ BOOL transport_set_blocking_mode(rdpTransport* transport, BOOL blocking)
transport->blocking = blocking;
WINPR_ASSERT(transport->frontBio);
if (!BIO_set_nonblock(transport->frontBio, blocking ? FALSE : TRUE))
return FALSE;
if (transport->frontBio)
{
if (!BIO_set_nonblock(transport->frontBio, blocking ? FALSE : TRUE))
return FALSE;
}
return TRUE;
}