Browse Source

obtain cs_wallet mutex to protect vchDefaultKey

0.8
Gavin Andresen 13 years ago
parent
commit
ed02c95d50
  1. 21
      src/wallet.cpp

21
src/wallet.cpp

@ -1280,20 +1280,23 @@ bool CWallet::GetKeyFromPool(vector<unsigned char>& result, bool fAllowReuse) @@ -1280,20 +1280,23 @@ bool CWallet::GetKeyFromPool(vector<unsigned char>& result, bool fAllowReuse)
{
int64 nIndex = 0;
CKeyPool keypool;
ReserveKeyFromKeyPool(nIndex, keypool);
if (nIndex == -1)
CRITICAL_BLOCK(cs_wallet)
{
if (fAllowReuse && !vchDefaultKey.empty())
ReserveKeyFromKeyPool(nIndex, keypool);
if (nIndex == -1)
{
result = vchDefaultKey;
if (fAllowReuse && !vchDefaultKey.empty())
{
result = vchDefaultKey;
return true;
}
if (IsLocked()) return false;
result = GenerateNewKey();
return true;
}
if (IsLocked()) return false;
result = GenerateNewKey();
return true;
KeepKey(nIndex);
result = keypool.vchPubKey;
}
KeepKey(nIndex);
result = keypool.vchPubKey;
return true;
}

Loading…
Cancel
Save