Merge #7913: Fix for incorrect locking in GetPubKey() (keystore.cpp)

220f950 Fix for incorrect locking in GetPubKey() (keystore.cpp) (Yuri Zhykin)
This commit is contained in:
Pieter Wuille 2016-04-21 13:54:19 +02:00
commit bafd075c5e
No known key found for this signature in database
GPG key ID: DBA1A67379A1A931

View file

@ -19,6 +19,7 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
{ {
CKey key; CKey key;
if (!GetKey(address, key)) { if (!GetKey(address, key)) {
LOCK(cs_KeyStore);
WatchKeyMap::const_iterator it = mapWatchKeys.find(address); WatchKeyMap::const_iterator it = mapWatchKeys.find(address);
if (it != mapWatchKeys.end()) { if (it != mapWatchKeys.end()) {
vchPubKeyOut = it->second; vchPubKeyOut = it->second;