Merge pull request #4371

ea3acaf AvailableCoins: acquire cs_main mutex (Pavel Vasin)
This commit is contained in:
Wladimir J. van der Laan 2014-06-20 16:57:02 +02:00
commit aaacfa0898
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -1028,7 +1028,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
vCoins.clear(); vCoins.clear();
{ {
LOCK(cs_wallet); LOCK2(cs_main, cs_wallet);
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{ {
const uint256& wtxid = it->first; const uint256& wtxid = it->first;