diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-10-24 04:53:53 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-10-24 05:01:29 -0400 |
| commit | e895fdc9fc83a35fc279b770b46c89e137e11128 (patch) | |
| tree | 46e487ab2d7b6297cd5cf1e2411a1fc380b1c66c /src/interfaces | |
| parent | 5473e255f6876ea457a03cbc97844fcf144f79cf (diff) | |
| parent | 69e7ee2dd8173597e766262fd9a8caae569ddf5e (diff) | |
Merge #11634: wallet: Add missing cs_wallet/cs_KeyStore locks to wallet
69e7ee2dd8 Add GUARDED_BY(cs_wallet) for setExternalKeyPool, mapKeyMetadata, m_script_metadata and setLockedCoins (practicalswift)
37b2538c2d Add GUARDED_BY(cs_wallet) for encrypted_batch, nWalletMaxVersion, m_max_keypool_index and nOrderPosNext (practicalswift)
dee42927c9 wallet: Add Clang thread safety analysis annotations (practicalswift)
1c7e25db0c wallet: Add missing locks (practicalswift)
Pull request description:
Add missing wallet locks:
* Calling the function `GetConflicts(...)` requires holding the mutex `cs_wallet`
* Calling the function `IsSpent(...)` requires holding the mutex `cs_wallet`
* Accessing the variables `mapKeys` and `mapCryptedKeys` requires holding the mutex `cs_KeyStore`
* Accessing the variable `nTimeFirstKey` requires holding the mutex `cs_wallet`
* Accessing the variable `mapWallet` requires holding the mutex `cs_wallet`
* Accessing the variable `nTimeFirstKey` requires holding the mutex `cs_wallet`
Tree-SHA512: 8a7b9a4e1f2147e77c04b817617a06304a2e2159148d3eb3514a3c09c41d77ef7e773df6e63880ad9acc026e00690f72d0c51f3f86279177f672d477423accca
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 566ae37509..84079fdc3c 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -103,7 +103,7 @@ static WalletTxStatus MakeWalletTxStatus(const CWalletTx& wtx) EXCLUSIVE_LOCKS_R } //! Construct wallet TxOut struct. -static WalletTxOut MakeWalletTxOut(CWallet& wallet, const CWalletTx& wtx, int n, int depth) EXCLUSIVE_LOCKS_REQUIRED(cs_main) +static WalletTxOut MakeWalletTxOut(CWallet& wallet, const CWalletTx& wtx, int n, int depth) EXCLUSIVE_LOCKS_REQUIRED(cs_main, wallet.cs_wallet) { WalletTxOut result; result.txout = wtx.tx->vout[n]; |