From bb0b791e6e693597d6766feab413dc1866b219ce Mon Sep 17 00:00:00 2001 From: Yoshinori Kajio Date: Tue, 24 Apr 2018 11:08:03 +0900 Subject: [PATCH 1/2] Fix socket leak(server_tcp_socket_fd_) on ConnectTCPSocket fail. --- network/OpenSSL/OpenSSLConnection.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/network/OpenSSL/OpenSSLConnection.cpp b/network/OpenSSL/OpenSSLConnection.cpp index 054e3ef..ca5909c 100644 --- a/network/OpenSSL/OpenSSLConnection.cpp +++ b/network/OpenSSL/OpenSSLConnection.cpp @@ -362,6 +362,11 @@ namespace awsiotsdk { networkResponse = ConnectTCPSocket(); if (ResponseCode::SUCCESS != networkResponse) { AWS_LOG_ERROR(OPENSSL_WRAPPER_LOG_TAG, "TCP Connection error"); +#ifdef WIN32 + closesocket(server_tcp_socket_fd_); +#else + close(server_tcp_socket_fd_); +#endif return networkResponse; } From 284a669c37e7b3273670a26bd91e863f40080e20 Mon Sep 17 00:00:00 2001 From: Yoshinori Kajio Date: Sat, 28 Apr 2018 06:31:35 +0900 Subject: [PATCH 2/2] Remove redundant close of socket. --- network/OpenSSL/OpenSSLConnection.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/network/OpenSSL/OpenSSLConnection.cpp b/network/OpenSSL/OpenSSLConnection.cpp index ca5909c..23e9460 100644 --- a/network/OpenSSL/OpenSSLConnection.cpp +++ b/network/OpenSSL/OpenSSLConnection.cpp @@ -238,11 +238,6 @@ namespace awsiotsdk { return ResponseCode::SUCCESS; } -#ifdef WIN32 - closesocket(server_tcp_socket_fd_); -#else - close(server_tcp_socket_fd_); -#endif AWS_LOG_ERROR(OPENSSL_WRAPPER_LOG_TAG, "connect - %s", strerror(errno)); return ResponseCode::NETWORK_TCP_CONNECT_ERROR; }