Add missing cs_lock in CreateWalletFromFile

promag · promag · commit 43a32b739551 · 2018-03-06T19:21:16.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4017,6 +4017,8 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)
     // Try to top up keypool. No-op if the wallet is locked.
     walletInstance->TopUpKeyPool();
 
+    LOCK(cs_main);
+
     CBlockIndex *pindexRescan = chainActive.Genesis();
     if (!gArgs.GetBoolArg("-rescan", false))
     {

Original file line number	Diff line number	Diff line change
`@@ -4017,6 +4017,8 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)`
`4017`	`4017`	`// Try to top up keypool. No-op if the wallet is locked.`
`4018`	`4018`	`walletInstance->TopUpKeyPool();`
`4019`	`4019`
	`4020`	`+ LOCK(cs_main);`
	`4021`	`+`
`4020`	`4022`	`CBlockIndex *pindexRescan = chainActive.Genesis();`
`4021`	`4023`	`if (!gArgs.GetBoolArg("-rescan", false))`
`4022`	`4024`	`{`