diff options
| author | Gregory Maxwell <[email protected]> | 2014-04-09 17:09:17 -0700 |
|---|---|---|
| committer | Gregory Maxwell <[email protected]> | 2014-04-09 17:09:45 -0700 |
| commit | 0bd05b53b155bc28b6e5dfd967cafaafb44a439f (patch) | |
| tree | e90d8f3131648bfc2c7ce2187f924b248cb325ac /src/netbase.cpp | |
| parent | Prevent socket leak in ThreadSocketHandler. (diff) | |
| download | discoin-0bd05b53b155bc28b6e5dfd967cafaafb44a439f.tar.xz discoin-0bd05b53b155bc28b6e5dfd967cafaafb44a439f.zip | |
Correct some proxy related socket leaks.
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index d5b75d6af..2b300e5dd 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -293,8 +293,10 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket) case 0x03: { ret = recv(hSocket, pchRet3, 1, 0) != 1; - if (ret) + if (ret) { + closesocket(hSocket); return error("Error reading from proxy"); + } int nRecv = pchRet3[0]; ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv; break; @@ -501,6 +503,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout) return false; break; default: + closesocket(hSocket); return false; } @@ -532,7 +535,9 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest switch(nameproxy.second) { default: - case 4: return false; + case 4: + closesocket(hSocket); + return false; case 5: if (!Socks5(strDest, port, hSocket)) return false; |