zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

obtain cs_wallet mutex to protect vchDefaultKey

This commit is contained in:
Gavin Andresen 2011-09-01 10:58:08 -04:00
parent 123e5bd998
commit ed02c95d50
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wallet.cpp
View File

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