Protect vNodes/vNodesDisconnected in CConnman::Stop()

dashpay · Apr 17, 2020 · 3ae02dd · 3ae02dd
1 parent 2f1b3a3
commit 3ae02dd
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -2897,23 +2897,30 @@ void CConnman::Stop()
         fAddressesInitialized = false;
     }
 
-    // Close sockets
-    for (CNode* pnode : vNodes)
-        pnode->CloseSocketDisconnect();
-    for (ListenSocket& hListenSocket : vhListenSocket)
-        if (hListenSocket.socket != INVALID_SOCKET)
-            if (!CloseSocket(hListenSocket.socket))
-                LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
-
-    // clean up some globals (to help leak detection)
-    for (CNode *pnode : vNodes) {
-        DeleteNode(pnode);
+    std::vector<CNode*> vNodesToDelete;
+    {
+        LOCK2(cs_vNodes, cs_vNodesDisconnected);
+        // Close sockets
+        for (CNode* pnode : vNodes)
+            pnode->CloseSocketDisconnect();
+        for (ListenSocket& hListenSocket : vhListenSocket)
+            if (hListenSocket.socket != INVALID_SOCKET)
+                if (!CloseSocket(hListenSocket.socket))
+                    LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
+
+        // clean up some globals (to help leak detection)
+        for (CNode *pnode : vNodes) {
+            vNodesToDelete.emplace_back(pnode);
+        }
+        for (CNode *pnode : vNodesDisconnected) {
+            vNodesToDelete.emplace_back(pnode);
+        }
+        vNodes.clear();
+        vNodesDisconnected.clear();
     }
-    for (CNode *pnode : vNodesDisconnected) {
+    for (auto pnode : vNodesToDelete) {
         DeleteNode(pnode);
     }
-    vNodes.clear();
-    vNodesDisconnected.clear();
     vhListenSocket.clear();
     semOutbound.reset();
     semAddnode.reset();