sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't hold cs_storage in CKeyHolderStorage while calling functions which might lock cs_wallet (#2000)

Browse Source 
Co-authored-by: Alexander Block <ablock84@gmail.com>
This commit is contained in:
UdjinM6 2018-03-20 14:06:07 +03:00 committed by GitHub
parent 4d442376e9
commit 4930bb9f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/privatesend-util.cpp
View File

@ -27,32 +27,45 @@ CScript CKeyHolder::GetScriptForDestination() const
CScript CKeyHolderStorage::AddKey(CWallet* pwallet)
{
auto keyHolder = std::unique_ptr<CKeyHolder>(new CKeyHolder(pwallet));
auto script = keyHolder->GetScriptForDestination();
LOCK(cs_storage);
storage.emplace_back(std::unique_ptr<CKeyHolder>(new CKeyHolder(pwallet)));
storage.emplace_back(std::move(keyHolder));
LogPrintf("CKeyHolderStorage::%s -- storage size %lld\n", __func__, storage.size());
return storage.back()->GetScriptForDestination();
return script;
}
void CKeyHolderStorage::KeepAll()
{
LOCK(cs_storage);
if (storage.size() > 0) {
for (auto &key : storage) {
std::vector<std::unique_ptr<CKeyHolder>> tmp;
{
// don't hold cs_storage while calling KeepKey(), which might lock cs_wallet
LOCK(cs_storage);
std::swap(storage, tmp);
}
if (tmp.size() > 0) {
for (auto &key : tmp) {
key->KeepKey();
}
LogPrintf("CKeyHolderStorage::%s -- %lld keys kept\n", __func__, storage.size());
storage.clear();
LogPrintf("CKeyHolderStorage::%s -- %lld keys kept\n", __func__, tmp.size());
}
}
void CKeyHolderStorage::ReturnAll()
{
LOCK(cs_storage);
if (storage.size() > 0) {
for (auto &key : storage) {
std::vector<std::unique_ptr<CKeyHolder>> tmp;
{
// don't hold cs_storage while calling ReturnKey(), which might lock cs_wallet
LOCK(cs_storage);
std::swap(storage, tmp);
}
if (tmp.size() > 0) {
for (auto &key : tmp) {
key->ReturnKey();
}
LogPrintf("CKeyHolderStorage::%s -- %lld keys returned\n", __func__, storage.size());
storage.clear();
LogPrintf("CKeyHolderStorage::%s -- %lld keys returned\n", __func__, tmp.size());
}
}