LoadWallet: acquire cs_wallet mutex before clearing setKeyPool

laanwj · laanwj · commit 012ca1c9e4f2 · 2013-12-19T10:00:58.000+01:00
Make the function mutex-aware, to prevent having to lock cs_wallet
at the call site in Init.
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1489,7 +1489,6 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV
 
 DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
 {
-    AssertLockHeld(cs_wallet); // setKeyPool
     if (!fFileBacked)
         return DB_LOAD_OK;
     fFirstRunRet = false;
@@ -1498,6 +1497,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
     {
         if (CDB::Rewrite(strWalletFile, "\x04pool"))
         {
+            LOCK(cs_wallet);
             setKeyPool.clear();
             // Note: can't top-up keypool here, because wallet is locked.
             // User will be prompted to unlock wallet the next operation

Original file line number	Diff line number	Diff line change
`@@ -1489,7 +1489,6 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nV`
`1489`	`1489`
`1490`	`1490`	`DBErrors CWallet::LoadWallet(bool& fFirstRunRet)`
`1491`	`1491`	`{`
`1492`		`- AssertLockHeld(cs_wallet); // setKeyPool`
`1493`	`1492`	`if (!fFileBacked)`
`1494`	`1493`	`return DB_LOAD_OK;`
`1495`	`1494`	`fFirstRunRet = false;`
`@@ -1498,6 +1497,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)`
`1498`	`1497`	`{`
`1499`	`1498`	`if (CDB::Rewrite(strWalletFile, "\x04pool"))`
`1500`	`1499`	`{`
	`1500`	`+ LOCK(cs_wallet);`
`1501`	`1501`	`setKeyPool.clear();`
`1502`	`1502`	`// Note: can't top-up keypool here, because wallet is locked.`
`1503`	`1503`	`// User will be prompted to unlock wallet the next operation`