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
@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()
                {
                    bool fDelete = false;
                    {
-                        TRY_LOCK(pnode->cs_vSend, lockSend);
+                        TRY_LOCK(pnode->cs_inventory, lockInv);
-                        if (lockSend)
+                        if (lockInv)
                        {
-                                TRY_LOCK(pnode->cs_inventory, lockInv);
+                            TRY_LOCK(pnode->cs_vSend, lockSend);
-                                if (lockInv)
+                            if (lockSend) {
-                                    fDelete = true;
+                                fDelete = true;
                            }
                        }
                    }
                    if (fDelete)