Merge pull request #1117 from sipa/deadlockfix

Fix potential deadlock
This commit is contained in:
Pieter Wuille 2012-04-17 11:05:02 -07:00
commit caeddc5d37

View File

@ -2838,8 +2838,8 @@ bool ProcessMessages(CNode* pfrom)
bool SendMessages(CNode* pto, bool fSendTrickle) bool SendMessages(CNode* pto, bool fSendTrickle)
{ {
{ TRY_LOCK(cs_main, lockMain);
LOCK(cs_main); if (lockMain) {
// Don't send anything until we get their version message // Don't send anything until we get their version message
if (pto->nVersion == 0) if (pto->nVersion == 0)
return true; return true;