Still invoke ReleaseNodeVector when interrupted

dashpay · Apr 17, 2020 · 9c2cd80 · 9c2cd80
1 parent f8ccbef
commit 9c2cd80
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -1662,7 +1662,7 @@ void CConnman::SocketHandler()
     for (CNode* pnode : vErrorNodes)
     {
         if (interruptNet) {
-            return;
+            break;
         }
         // let recv() return errors and then handle it
         SocketRecvData(pnode);
@@ -1671,7 +1671,7 @@ void CConnman::SocketHandler()
     for (CNode* pnode : vReceivableNodes)
     {
         if (interruptNet) {
-            return;
+            break;
         }
         if (pnode->fPauseRecv) {
             continue;
@@ -1682,7 +1682,7 @@ void CConnman::SocketHandler()
 
     for (CNode* pnode : vSendableNodes) {
         if (interruptNet) {
-            return;
+            break;
         }
 
         LOCK(pnode->cs_vSend);
@@ -1696,6 +1696,10 @@ void CConnman::SocketHandler()
     ReleaseNodeVector(vReceivableNodes);
     ReleaseNodeVector(vSendableNodes);
 
+    if (interruptNet) {
+        return;
+    }
+
     {
         LOCK(cs_vNodes);
         // remove nodes from mapSendableNodes, so that the next iteration knows that there is no work to do