highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 10:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lock cs_vSend and cs_inventory in a consistent order even in TRY

Browse Source
This commit is contained in:
Matt Corallo
2017-02-02 20:03:46 -05:00
parent 1c2edd9f67
commit fd13eca147
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net.cpp
View File

@ -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);