Protect CKeyHolderStorage via mutex (#1834)

This commit is contained in:
UdjinM6 2018-01-09 12:18:10 +03:00 committed by GitHub
parent d69ad9d619
commit c532be1c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -27,12 +27,14 @@ CScript CKeyHolder::GetScriptForDestination() const
const CKeyHolder& CKeyHolderStorage::AddKey(CWallet* pwallet)
{
LOCK(cs_storage);
storage.emplace_back(std::unique_ptr<CKeyHolder>(new CKeyHolder(pwallet)));
LogPrintf("CKeyHolderStorage::%s -- storage size %lld\n", __func__, storage.size());
return *storage.back();
}
void CKeyHolderStorage::KeepAll(){
LOCK(cs_storage);
if (storage.size() > 0) {
for (auto &key : storage) {
key->KeepKey();
@ -44,6 +46,7 @@ void CKeyHolderStorage::KeepAll(){
void CKeyHolderStorage::ReturnAll()
{
LOCK(cs_storage);
if (storage.size() > 0) {
for (auto &key : storage) {
key->ReturnKey();

View File

@ -27,6 +27,7 @@ class CKeyHolderStorage
{
private:
std::vector<std::unique_ptr<CKeyHolder> > storage;
mutable CCriticalSection cs_storage;
public:
const CKeyHolder& AddKey(CWallet* pwalletIn);