Add back mistakenly removed AssertLockHeld

ryanofsky · ryanofsky · commit 628d11b2ba0f · 2019-10-29T12:21:57.000-04:00
Suggestion from MarcoFalke <falke.marco@gmail.com> bitcoin/bitcoin#17260 (comment)
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -386,6 +386,8 @@ bool LegacyScriptPubKeyMan::AddKeyPubKey(const CKey& secret, const CPubKey &pubk
 
 bool LegacyScriptPubKeyMan::AddKeyPubKeyWithDB(WalletBatch& batch, const CKey& secret, const CPubKey& pubkey)
 {
+    AssertLockHeld(cs_wallet);
+
     // Make sure we aren't adding private keys to private key disabled wallets
     assert(!m_storage.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS));
 

Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,8 @@ bool LegacyScriptPubKeyMan::AddKeyPubKey(const CKey& secret, const CPubKey &pubk`
`386`	`386`
`387`	`387`	`bool LegacyScriptPubKeyMan::AddKeyPubKeyWithDB(WalletBatch& batch, const CKey& secret, const CPubKey& pubkey)`
`388`	`388`	`{`
	`389`	`+ AssertLockHeld(cs_wallet);`
	`390`	`+`
`389`	`391`	`// Make sure we aren't adding private keys to private key disabled wallets`
`390`	`392`	`assert(!m_storage.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS));`
`391`	`393`