Lock cs_vSend and cs_inventory in a consistent order even in TRY

8 years ago · fd13eca147
1 changed files with 6 additions and 5 deletions
--- a/src/net.cpp
+++ b/src/net.cpp
@ -1069,15 +1069,16 @@ void CConnman::ThreadSocketHandler()
				@@ -1069,15 +1069,16 @@ void CConnman::ThreadSocketHandler()
                if (pnode->GetRefCount() <= 0)
                {
                    bool fDelete = false;
-                    {
-                        TRY_LOCK(pnode->cs_vSend, lockSend);
-                        if (lockSend)
                    {
                        TRY_LOCK(pnode->cs_inventory, lockInv);
                        if (lockInv)
+                        {
+                            TRY_LOCK(pnode->cs_vSend, lockSend);
+                            if (lockSend) {
                                fDelete = true;
                            }
                        }
+                    }
                    if (fDelete)
                    {
                        vNodesDisconnected.remove(pnode);