TRY_LOCK for blocks

dashpay · Aug 1, 2015 · 171c0b1 · 171c0b1
1 parent 44c9941
commit 171c0b1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4881,6 +4881,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
     else if (strCommand == "block" && !fImporting && !fReindex) // Ignore blocks received while importing
     {
+        TRY_LOCK(cs_main, lockMainBlock);
+        if(!lockMainBlock) return;
+
         CBlock block;
         vRecv >> block;
 
@@ -4896,7 +4899,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             pfrom->PushMessage("reject", strCommand, state.GetRejectCode(),
                                state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), inv.hash);
             if (nDoS > 0) {
-                LOCK(cs_main);
                 Misbehaving(pfrom->GetId(), nDoS);
             }
         }