Wallet::CreateWalletFromFile guard direct chainActive access

PIVX-Project · Mar 10, 2021 · c4952a2 · c4952a2
1 parent f889dcb
commit c4952a2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4222,11 +4222,12 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)
             return nullptr;
         }
 
-        walletInstance->SetBestChain(chainActive.GetLocator());
+        walletInstance->SetBestChain(WITH_LOCK(cs_main, return chainActive.GetLocator()));
     }
 
     LogPrintf("Wallet completed loading in %15dms\n", GetTimeMillis() - nStart);
 
+    LOCK(cs_main);
     CBlockIndex* pindexRescan = chainActive.Genesis();
     if (!gArgs.GetBoolArg("-rescan", false)) {
         CWalletDB walletdb(*walletInstance->dbw);