wallet: GetLabelAddresses requires cs_wallet lock

promag · promag · commit 32d036e8dab5 · 2021-09-03T18:28:12.000+01:00
No change in behavior, the lock is already held at call sites.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2191,7 +2191,7 @@ void CWallet::MarkDestinationsDirty(const std::set<CTxDestination>& destinations
 
 std::set<CTxDestination> CWallet::GetLabelAddresses(const std::string& label) const
 {
-    LOCK(cs_wallet);
+    AssertLockHeld(cs_wallet);
     std::set<CTxDestination> result;
     for (const std::pair<const CTxDestination, CAddressBookData>& item : m_address_book)
     {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -630,7 +630,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
 
     int64_t GetOldestKeyPoolTime() const;
 
-    std::set<CTxDestination> GetLabelAddresses(const std::string& label) const;
+    std::set<CTxDestination> GetLabelAddresses(const std::string& label) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     /**
      * Marks all outputs in each one of the destinations dirty, so their cache is

Original file line number	Diff line number	Diff line change
`@@ -2191,7 +2191,7 @@ void CWallet::MarkDestinationsDirty(const std::set<CTxDestination>& destinations`
`2191`	`2191`
`2192`	`2192`	`std::set<CTxDestination> CWallet::GetLabelAddresses(const std::string& label) const`
`2193`	`2193`	`{`
`2194`		`- LOCK(cs_wallet);`
	`2194`	`+ AssertLockHeld(cs_wallet);`
`2195`	`2195`	`std::set<CTxDestination> result;`
`2196`	`2196`	`for (const std::pair<const CTxDestination, CAddressBookData>& item : m_address_book)`
`2197`	`2197`	`{`