LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages 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
Show stats 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) if (pnode->GetRefCount() <= 0)
{ {
bool fDelete = false; bool fDelete = false;
{
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend)
{ {
TRY_LOCK(pnode->cs_inventory, lockInv); TRY_LOCK(pnode->cs_inventory, lockInv);
if (lockInv) if (lockInv)
{
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend) {
fDelete = true; fDelete = true;
} }
} }
}
if (fDelete) if (fDelete)
{ {
vNodesDisconnected.remove(pnode); vNodesDisconnected.remove(pnode);