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

pull rodentrabies wants to merge 1 commits into bitcoin:master from rodentrabies:getpubkey-locking-fix changing 1 files +1 −0

rodentrabies commented at 9:06 PM on April 19, 2016: contributor

Fix for issue #7901

in src/keystore.cpp:None in 767486a639 outdated

  18 | @@ -19,6 +19,7 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
  19 |  {
  20 |      CKey key;
  21 |      if (!GetKey(address, key)) {
  22 | +	LOCK(cs_KeyStore);

sipa commented at 8:33 AM on April 20, 2016:

Nit: indendation error

sipa commented at 8:33 AM on April 20, 2016: member

utACK, but fix the indendation
rodentrabies commented at 8:42 AM on April 20, 2016: contributor

Oh, yes, sorry. I thought I had no-tabs mode for C++ in Emacs.
laanwj added the label Wallet on Apr 20, 2016
MarcoFalke commented at 10:19 AM on April 20, 2016: member

@yurizhykin Mind to squash the commits?
jonasschnelli commented at 11:35 AM on April 20, 2016: contributor

utACK (but please squash commits)
Fix for incorrect locking in GetPubKey() (keystore.cpp) 220f950ab1
rodentrabies force-pushed on Apr 20, 2016
rodentrabies commented at 1:08 PM on April 20, 2016: contributor

Yep, squashed.
paveljanik commented at 1:12 PM on April 20, 2016: contributor

ACK https://github.com/bitcoin/bitcoin/pull/7913/commits/220f950ab1302f8f8c0bb5b9c818f3d6569796bd
jonasschnelli commented at 1:37 PM on April 20, 2016: contributor

ACK 220f950ab1302f8f8c0bb5b9c818f3d6569796bd
dcousens commented at 4:12 AM on April 21, 2016: contributor

utACK 220f950
sipa merged this on Apr 21, 2016
sipa closed this on Apr 21, 2016
sipa referenced this in commit bafd075c5e on Apr 21, 2016
rodentrabies deleted the branch on May 30, 2016
LarryRuane referenced this in commit e715e1393b on Feb 20, 2021
zkbot referenced this in commit d95a957841 on Apr 1, 2021
zkbot referenced this in commit 2d3b58c993 on Apr 1, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#7901 Keystore.cpp: Is locking correctly implemented here?