diff options
| author | Russell Yanofsky <russ@yanofsky.org> | 2017-02-15 17:01:30 -0500 |
|---|---|---|
| committer | Russell Yanofsky <russ@yanofsky.org> | 2017-02-15 17:01:30 -0500 |
| commit | 07afcd6379bb46ace5856f6a47a9188cf9aed2ea (patch) | |
| tree | 61d3f1f987dcf8ec9a89919d2756d0b3fc51fe7f | |
| parent | 7a93af8340d95add7f0d9ddf051aa242302cfc10 (diff) | |
| download | bitcoin-07afcd6379bb46ace5856f6a47a9188cf9aed2ea.tar.xz | |
Add missing cs_wallet lock that triggers new lock held assertion
A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108).
The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.
| -rw-r--r-- | src/wallet/walletdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 106a59d562..81fdde401e 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) bool fNoncriticalErrors = false; DBErrors result = DB_LOAD_OK; + LOCK(pwallet->cs_wallet); try { - LOCK(pwallet->cs_wallet); int nMinVersion = 0; if (Read((string)"minversion", nMinVersion)) { |