zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4037 from gmaxwell/fdleaks 

Prevent socket leak in ThreadSocketHandler.
This commit is contained in:
Gregory Maxwell 2014-04-18 15:16:52 -07:00
parent 2f3308f2d2 0bd05b53b1
commit fe451fe944
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net.cpp
View File

@ -946,11 +946,7 @@ void ThreadSocketHandler()
} }
else if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS) else if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS)
{ {
{ closesocket(hSocket);
LOCK(cs_setservAddNodeAddresses);
if (!setservAddNodeAddresses.count(addr))
closesocket(hSocket);
}
} }
else if (CNode::IsBanned(addr)) else if (CNode::IsBanned(addr))
{ {

9
src/netbase.cpp
View File

@ -293,8 +293,10 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)
case 0x03: case 0x03:
{ {
ret = recv(hSocket, pchRet3, 1, 0) != 1; ret = recv(hSocket, pchRet3, 1, 0) != 1;
if (ret) if (ret) {
closesocket(hSocket);
return error("Error reading from proxy"); return error("Error reading from proxy");
}
int nRecv = pchRet3[0]; int nRecv = pchRet3[0];
ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv; ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv;
break; break;
@ -501,6 +503,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout)
return false; return false;
break; break;
default: default:
closesocket(hSocket);
return false; return false;
} }
@ -532,7 +535,9 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
switch(nameproxy.second) { switch(nameproxy.second) {
default: default:
case 4: return false; case 4:
closesocket(hSocket);
return false;
case 5: case 5:
if (!Socks5(strDest, port, hSocket)) if (!Socks5(strDest, port, hSocket))
return false; return false;