BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure cs_vNodes is held when using the return value from FindNode

This commit is contained in:
Matt Corallo 2017-01-24 16:50:27 -05:00
parent 5be01906e5
commit 3c37dc40d3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/net.cpp
View File

@ -369,16 +369,14 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
// In that case, drop the connection that was just created, and return the existing CNode instead. // In that case, drop the connection that was just created, and return the existing CNode instead.
// Also store the name we used to connect in that CNode, so that future FindNode() calls to that // Also store the name we used to connect in that CNode, so that future FindNode() calls to that
// name catch this early. // name catch this early.
LOCK(cs_vNodes);
CNode* pnode = FindNode((CService)addrConnect); CNode* pnode = FindNode((CService)addrConnect);
if (pnode) if (pnode)
{ {
pnode->AddRef(); pnode->AddRef();
{
LOCK(cs_vNodes);
if (pnode->addrName.empty()) { if (pnode->addrName.empty()) {
pnode->addrName = std::string(pszDest); pnode->addrName = std::string(pszDest);
} }
}
CloseSocket(hSocket); CloseSocket(hSocket);
return pnode; return pnode;
} }
@ -2373,6 +2371,7 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
bool CConnman::DisconnectNode(const std::string& strNode) bool CConnman::DisconnectNode(const std::string& strNode)
{ {
LOCK(cs_vNodes);
if (CNode* pnode = FindNode(strNode)) { if (CNode* pnode = FindNode(strNode)) {
pnode->fDisconnect = true; pnode->fDisconnect = true;
return true; return true;