Merge pull request #1593 from akallabeth/transport_fixes

Transport disconnect fixes
2013-11-14 09:12:12 -08:00 · 2013-11-14 09:12:12 -08:00 · c347dd0843
commit c347dd0843
parent 72770c8c43 6f43252c9a
2 changed files with 6 additions and 0 deletions
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@ -74,6 +74,9 @@ BOOL transport_disconnect(rdpTransport* transport)
 {
 	BOOL status = TRUE;

+	if (!transport)
+		return FALSE;
+
 	if (transport->layer == TRANSPORT_LAYER_TLS)
 		status &= tls_disconnect(transport->TlsIn);

--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@ -360,6 +360,9 @@ BOOL tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file)

 BOOL tls_disconnect(rdpTls* tls)
 {
+	if (!tls)
+		return FALSE;
+
 	if (tls->ssl)
 		SSL_shutdown(tls->ssl);