diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2015-06-16 04:02:25 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-06-16 04:04:02 -0400 |
| commit | 2b890dd424b32320be6fc0333e67e2d7c9616065 (patch) | |
| tree | c20253faf3dd5346a8c4b2686144fb59edb2bac2 /src/wallet | |
| parent | cd27bba060d91995da706bc03cd2ef39b79b49b1 (diff) | |
| download | bitcoin-2b890dd424b32320be6fc0333e67e2d7c9616065.tar.xz | |
locking: fix a few small issues uncovered by -Wthread-safety
- rpcwallet: No need to lock twice here
- openssl: Clang doesn't understand selective lock/unlock here. Ignore it.
- CNode: Fix a legitimate (though very unlikely) locking bug.
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5404dd4aa0..b32f1f6b07 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -476,7 +476,6 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp) addressInfo.push_back(CBitcoinAddress(address).ToString()); addressInfo.push_back(ValueFromAmount(balances[address])); { - LOCK(pwalletMain->cs_wallet); if (pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get()) != pwalletMain->mapAddressBook.end()) addressInfo.push_back(pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get())->second.name); } |