Fix misplaced AssertLockHeld

ryanofsky · ryanofsky · commit 4b28a05f080d · 2019-10-29T12:24:34.000-04:00
Suggestion from MarcoFalke <falke.marco@gmail.com> bitcoin/bitcoin#17260 (comment)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -249,8 +249,8 @@ const CWalletTx* CWallet::GetWalletTx(const uint256& hash) const
 
 void CWallet::UpgradeKeyMetadata()
 {
-    AssertLockHeld(m_spk_man->cs_wallet);
     if (m_spk_man) {
+        AssertLockHeld(m_spk_man->cs_wallet);
         m_spk_man->UpgradeKeyMetadata();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,8 @@ const CWalletTx* CWallet::GetWalletTx(const uint256& hash) const`
`249`	`249`
`250`	`250`	`void CWallet::UpgradeKeyMetadata()`
`251`	`251`	`{`
`252`		`- AssertLockHeld(m_spk_man->cs_wallet);`
`253`	`252`	`if (m_spk_man) {`
	`253`	`+ AssertLockHeld(m_spk_man->cs_wallet);`
`254`	`254`	`m_spk_man->UpgradeKeyMetadata();`
`255`	`255`	`}`
`256`	`256`	`}`