morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix TLS free logic, fixing double free in issue #531

Browse Source
This commit is contained in:
Raphal Rigo
2012-04-10 21:15:36 +02:00
parent d9b513b18c
commit 02439d3168
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libfreerdp-core/transport.c
View File

@@ -92,8 +92,11 @@ boolean transport_connect_tls(rdpTransport* transport)
transport->layer = TRANSPORT_LAYER_TLS;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_connect(transport->tls) != true)
if (tls_connect(transport->tls) != true) {
tls_free(transport->tls);
transport->tls = NULL;
return false;
}
return true;
}
@@ -109,8 +112,11 @@ boolean transport_connect_nla(rdpTransport* transport)
transport->layer = TRANSPORT_LAYER_TLS;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_connect(transport->tls) != true)
if (tls_connect(transport->tls) != true) {
tls_free(transport->tls);
transport->tls = NULL;
return false;
}
/* Network Level Authentication */

6
libfreerdp-crypto/tls.c
View File

@@ -53,6 +53,7 @@ static void tls_free_certificate(CryptoCert cert)
xfree(cert);
}
boolean tls_connect(rdpTls* tls)
{
CryptoCert cert;
@@ -80,15 +81,12 @@ boolean tls_connect(rdpTls* tls)
if (tls->ssl == NULL)
{
SSL_CTX_free(tls->ctx);
printf("SSL_new failed\n");
return false;
}
if (SSL_set_fd(tls->ssl, tls->sockfd) < 1)
{
SSL_free(tls->ssl);
SSL_CTX_free(tls->ctx);
printf("SSL_set_fd failed\n");
return false;
}
@@ -99,8 +97,6 @@ boolean tls_connect(rdpTls* tls)
{
if (tls_print_error("SSL_connect", tls->ssl, connection_status))
{
SSL_free(tls->ssl);
SSL_CTX_free(tls->ctx);
return false;
}
}