diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-28 10:47:07 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-28 10:56:41 +0200 |
| commit | df91e11ae1e9d7af55a549b597a73d01e3a646c7 (patch) | |
| tree | 04d7f987178e684c741a106239455bb8a632a521 /src/crypto | |
| parent | 9c833f471c14a4438515b6318dbbc5370e8ef7a0 (diff) | |
| parent | de9a1db2ed14e0c75ffd82dc031f7ad30c56d195 (diff) | |
| download | bitcoin-df91e11ae1e9d7af55a549b597a73d01e3a646c7.tar.xz | |
Merge #11126: Acquire cs_main lock before cs_wallet during wallet initialization
de9a1db Acquire cs_main lock before cs_wallet during wallet initialization (Russell Yanofsky)
Pull request description:
`CWallet::MarkConflicted` may acquire the `cs_main` lock after `CWalletDB::LoadWallet` acquires the `cs_wallet` lock during wallet initialization. (`CWalletDB::LoadWallet` calls `ReadKeyValue` which calls `CWallet::LoadToWallet` which calls `CWallet::MarkConflicted`). This is the opposite order that `cs_main` and `cs_wallet` locks are acquired in the rest of the code, and so leads to `POTENTIAL DEADLOCK DETECTED` errors if bitcoin is built with `-DDEBUG_LOCKORDER`.
This commit changes `CWallet::LoadWallet` (which calls `CWalletDB::LoadWallet`) to acquire both locks in the standard order.
Error was reported by @luke-jr in https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/
Tree-SHA512: 353fe21bc0a4a2828b41876897001a3c414d4b115ee7430925bd391d8bc396fca81661145d00996c1ba1a01516d9acf8b89fb5c3da27092f5f3aa7e37ef26ffa
Diffstat (limited to 'src/crypto')
0 files changed, 0 insertions, 0 deletions