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

libfreerdp-core: fix tsg crash on disconnect

Browse Source
This commit is contained in:
Marc-André Moreau 2015-02-11 10:57:14 -05:00
parent 94494511cc
commit 46724b0c75
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/core/tcp.c
View File

@ -337,6 +337,7 @@ static int transport_bio_simple_uninit(BIO* bio)
{
if (bio->init)
{
_shutdown(ptr->socket, SD_BOTH);
closesocket(ptr->socket);
ptr->socket = 0;
}
@ -1123,19 +1124,6 @@ BOOL freerdp_tcp_connect(rdpTcp* tcp, const char* hostname, int port, int timeou
return TRUE;
}
BOOL freerdp_tcp_disconnect(rdpTcp* tcp)
{
if (tcp->sockfd != -1)
{
shutdown(tcp->sockfd, SHUT_RDWR);
close(tcp->sockfd);
tcp->sockfd = -1;
}
return TRUE;
}
BOOL freerdp_tcp_set_blocking_mode(rdpTcp* tcp, BOOL blocking)
{
return BIO_set_nonblock(tcp->socketBio, blocking ? 0 : 1) ? TRUE : FALSE;

1
libfreerdp/core/tcp.h
View File

@ -70,7 +70,6 @@ struct rdp_tcp
};
BOOL freerdp_tcp_connect(rdpTcp* tcp, const char* hostname, int port, int timeout);
BOOL freerdp_tcp_disconnect(rdpTcp* tcp);
int freerdp_tcp_read(rdpTcp* tcp, BYTE* data, int length);
int freerdp_tcp_write(rdpTcp* tcp, BYTE* data, int length);
int freerdp_tcp_wait_read(rdpTcp* tcp, DWORD dwMilliSeconds);

55
libfreerdp/core/transport.c
View File

@ -100,36 +100,44 @@ BOOL transport_disconnect(rdpTransport* transport)
transport_stop(transport);
if (transport->TlsIn)
tls_free(transport->TlsIn);
if (transport->tsg)
{
if (transport->TsgTls)
{
tls_free(transport->TsgTls);
transport->TsgTls = NULL;
}
if (transport->TlsOut != transport->TlsIn)
tls_free(transport->TlsOut);
tsg_free(transport->tsg);
transport->tsg = NULL;
if (transport->TlsIn)
tls_free(transport->TlsIn);
if (transport->TcpIn)
freerdp_tcp_free(transport->TcpIn);
if (transport->TlsOut)
tls_free(transport->TlsOut);
if (transport->TcpOut)
freerdp_tcp_free(transport->TcpOut);
}
else
{
if (transport->TlsIn)
tls_free(transport->TlsIn);
if (transport->TcpIn)
freerdp_tcp_free(transport->TcpIn);
}
transport->TlsIn = NULL;
transport->TlsOut = NULL;
if (transport->tsg)
{
tsg_free(transport->tsg);
transport->tsg = NULL;
}
if (transport->TcpOut && (transport->TcpOut != transport->TcpIn)) {
freerdp_tcp_disconnect(transport->TcpOut);
freerdp_tcp_free(transport->TcpOut);
}
transport->TcpIn = NULL;
transport->TcpOut = NULL;
if (transport->TsgTls)
{
tls_free(transport->TsgTls);
transport->TsgTls = NULL;
}
freerdp_tcp_disconnect(transport->TcpIn);
transport->layer = TRANSPORT_LAYER_TCP;
return status;
@ -1168,5 +1176,6 @@ void transport_free(rdpTransport* transport)
CloseHandle(transport->connectedEvent);
DeleteCriticalSection(&(transport->ReadLock));
DeleteCriticalSection(&(transport->WriteLock));
free(transport);
}