Merge #9671: Fix super-unlikely race introduced in 2366180

laanwj · laanwj · commit 7821db30e161 · 2017-02-04T11:39:17.000+01:00
885cfdd Fix super-unlikely race introduced in 2366180 (Matt Corallo)
diff --git a/src/net.cpp b/src/net.cpp
@@ -1860,11 +1860,11 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     if (fAddnode)
         pnode->fAddnode = true;
 
+    GetNodeSignals().InitializeNode(pnode, *this);
     {
         LOCK(cs_vNodes);
         vNodes.push_back(pnode);
     }
-    GetNodeSignals().InitializeNode(pnode, *this);
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1860,11 +1860,11 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai`
`1860`	`1860`	`if (fAddnode)`
`1861`	`1861`	`pnode->fAddnode = true;`
`1862`	`1862`
	`1863`	`+ GetNodeSignals().InitializeNode(pnode, *this);`
`1863`	`1864`	`{`
`1864`	`1865`	`LOCK(cs_vNodes);`
`1865`	`1866`	`vNodes.push_back(pnode);`
`1866`	`1867`	`}`
`1867`		`- GetNodeSignals().InitializeNode(pnode, *this);`
`1868`	`1868`
`1869`	`1869`	`return true;`
`1870`	`1870`	`}`