Lock cs_vSend and cs_inventory in a consistent order even in TRY

absolute-community · Feb 3, 2017 · fd13eca · fd13eca
1 parent 1c2edd9
commit fd13eca
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/net.cpp b/src/net.cpp
@@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()
                 {
                     bool fDelete = false;
                     {
-                        TRY_LOCK(pnode->cs_vSend, lockSend);
-                        if (lockSend)
+                        TRY_LOCK(pnode->cs_inventory, lockInv);
+                        if (lockInv)
                         {
-                                TRY_LOCK(pnode->cs_inventory, lockInv);
-                                if (lockInv)
-                                    fDelete = true;
+                            TRY_LOCK(pnode->cs_vSend, lockSend);
+                            if (lockSend) {
+                                fDelete = true;
+                            }
                         }
                     }
                     if (fDelete)