Add missing cs_wallet lock that triggers new lock held assertion

ryanofsky · ryanofsky · commit 07afcd6379bb · 2017-02-15T17:01:30.000-05:00
A new AssertLockHeld(cs_wallet) call was added in commit a58370e "Dedup nTimeFirstKey update logic" (part of PR #9108). The lock held assertion will fail when loading prexisting wallets files from before the #9108 merge that have watch-only keys.
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
     bool fNoncriticalErrors = false;
     DBErrors result = DB_LOAD_OK;
 
+    LOCK(pwallet->cs_wallet);
     try {
-        LOCK(pwallet->cs_wallet);
         int nMinVersion = 0;
         if (Read((string)"minversion", nMinVersion))
         {

Original file line number	Diff line number	Diff line change
`@@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)`
`559`	`559`	`bool fNoncriticalErrors = false;`
`560`	`560`	`DBErrors result = DB_LOAD_OK;`
`561`	`561`
	`562`	`+ LOCK(pwallet->cs_wallet);`
`562`	`563`	`try {`
`563`		`- LOCK(pwallet->cs_wallet);`
`564`	`564`	`int nMinVersion = 0;`
`565`	`565`	`if (Read((string)"minversion", nMinVersion))`
`566`	`566`	`{`