aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorCozz Lovan <cozzlovan@yahoo.com>2014-03-09 12:41:22 +0100
committerCozz Lovan <cozzlovan@yahoo.com>2014-03-11 23:39:51 +0100
commit53d56881a80906bc18cf243deac3e9a721876278 (patch)
tree8dc784c0755a75cbe461c05dcd407cef205e6044 /src/wallet.cpp
parentfbdf4e5efaa612f05a37b1f0d29e8345b45ae1cb (diff)
downloadbitcoin-53d56881a80906bc18cf243deac3e9a721876278.tar.xz
Fix missing wallet lock in CWallet::SyncTransaction(..)
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 4f7b96e7f2..df1eb549ad 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -589,7 +589,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet)
bool CWallet::AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& tx, const CBlock* pblock, bool fUpdate)
{
{
- LOCK(cs_wallet);
+ AssertLockHeld(cs_wallet);
bool fExisted = mapWallet.count(hash);
if (fExisted && !fUpdate) return false;
if (fExisted || IsMine(tx) || IsFromMe(tx))
@@ -606,9 +606,8 @@ bool CWallet::AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction&
void CWallet::SyncTransaction(const uint256 &hash, const CTransaction& tx, const CBlock* pblock)
{
- AddToWalletIfInvolvingMe(hash, tx, pblock, true);
-
- if (mapWallet.count(hash) == 0)
+ LOCK(cs_wallet);
+ if (!AddToWalletIfInvolvingMe(hash, tx, pblock, true))
return; // Not one of ours
// If a transaction changes 'conflicted' state, that changes the balance