Update quorums_chainlocks.cpp

syscoin · Oct 7, 2022 · 603f67d · 603f67d
1 parent 2c622b1
commit 603f67d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
@@ -360,7 +360,11 @@ void CChainLocksHandler::ProcessNewChainLock(const NodeId from, llmq::CChainLock
         return;
     }
     CBlockIndex* pindexScan{nullptr};
-    const CBlockIndex* bestIndex = bestChainLockBlockIndex;
+    const CBlockIndex* bestIndex;
+    {
+        LOCK(cs);
+        bestIndex = bestChainLockBlockIndex;
+    }
     {
         LOCK(cs_main);
         if (clsig.nHeight > chainman.ActiveHeight() + (CSigningManager::SIGN_HEIGHT_OFFSET - CSigningManager::SIGN_HEIGHT_LOOKBACK)) {
@@ -656,7 +660,11 @@ void CChainLocksHandler::TrySignChainTip()
     // To simplify the initial implementation, we skip this process and directly try to create a CLSIG
     // This will fail when multiple blocks compete, but we accept this for the initial implementation.
     // Later, we'll add the multiple attempts process.
-    const CBlockIndex* bestIndex = bestChainLockBlockIndex;
+    const CBlockIndex* bestIndex;
+    {
+        LOCK(cs);
+        bestIndex = bestChainLockBlockIndex;
+    }
     {
         LOCK(cs_main);
         // current chainlock should be confirmed before trying to make new one (don't let headers-only be locked by more than 1 CL)