BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lock cs_vSend and cs_inventory in a consistent order even in TRY

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

11
src/net.cpp
View File

@ -1070,12 +1070,13 @@ void CConnman::ThreadSocketHandler()
{ {
bool fDelete = false; 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) if (fDelete)