Ensure cs_vNodes is held when using the return value from FindNode
This commit is contained in:
parent
5be01906e5
commit
3c37dc40d3
1 changed files with 4 additions and 5 deletions
|
@ -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.
|
||||
// Also store the name we used to connect in that CNode, so that future FindNode() calls to that
|
||||
// name catch this early.
|
||||
LOCK(cs_vNodes);
|
||||
CNode* pnode = FindNode((CService)addrConnect);
|
||||
if (pnode)
|
||||
{
|
||||
pnode->AddRef();
|
||||
{
|
||||
LOCK(cs_vNodes);
|
||||
if (pnode->addrName.empty()) {
|
||||
pnode->addrName = std::string(pszDest);
|
||||
}
|
||||
}
|
||||
CloseSocket(hSocket);
|
||||
return pnode;
|
||||
}
|
||||
|
@ -2373,6 +2371,7 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats)
|
|||
|
||||
bool CConnman::DisconnectNode(const std::string& strNode)
|
||||
{
|
||||
LOCK(cs_vNodes);
|
||||
if (CNode* pnode = FindNode(strNode)) {
|
||||
pnode->fDisconnect = true;
|
||||
return true;
|
||||
|
|
Loading…
Reference in a new issue