Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

TCPConnector: Don't leak socket descriptors.

Browse Source 
Also check to see if socket() returns error (less than 0) and error out.
This commit is contained in:
Peter Johnson
2016-01-04 13:08:00 -08:00
parent d9efcbc7a9
commit 20f23e0e31
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tcpsockets/TCPConnector.cpp
View File

@@ -35,6 +35,7 @@
#include <arpa/inet.h>
#include <netinet/in.h>
#include <sys/select.h>
#include <unistd.h>
#endif
#include "TCPStream.h"
@@ -100,8 +101,17 @@ std::unique_ptr<NetworkStream> TCPConnector::connect(const char* server,
if (timeout == 0) {
int sd = socket(AF_INET, SOCK_STREAM, 0);
if (sd < 0) {
ERROR("could not create socket");
return nullptr;
}
if (::connect(sd, (struct sockaddr*)&address, sizeof(address)) != 0) {
ERROR("connect() to " << server << " port " << port << " failed: " << SocketStrerror());
#ifdef _WIN32
closesocket(sd);
#else
::close(sd);
#endif
return nullptr;
}
return std::unique_ptr<NetworkStream>(new TCPStream(sd, &address));
@@ -111,6 +121,10 @@ std::unique_ptr<NetworkStream> TCPConnector::connect(const char* server,
struct timeval tv;
socklen_t len;
int result = -1, valopt, sd = socket(AF_INET, SOCK_STREAM, 0);
if (sd < 0) {
ERROR("could not create socket");
return nullptr;
}
// Set socket to non-blocking
#ifdef _WIN32
@@ -161,7 +175,14 @@ std::unique_ptr<NetworkStream> TCPConnector::connect(const char* server,
fcntl(sd, F_SETFL, arg);
#endif
// Create stream object if connected
if (result == -1) return nullptr;
// Create stream object if connected, close if not.
if (result == -1) {
#ifdef _WIN32
closesocket(sd);
#else
::close(sd);
#endif
return nullptr;
}
return std::unique_ptr<NetworkStream>(new TCPStream(sd, &address));
}