diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-03-09 11:15:41 +0100 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-03-09 11:16:50 +0100 |
| commit | 05e5af5a6c884d2ade3d7acc766ad5380cb85b64 (patch) | |
| tree | f612c640339abba9f99aebc75b50521b783b4f43 | |
| parent | 0cc5a19205f8cf915f7e3c894abef46a9ba3b170 (diff) | |
| parent | 7a68fe4831787a66986a76306180c7876ecba37f (diff) | |
| download | bitcoin-05e5af5a6c884d2ade3d7acc766ad5380cb85b64.tar.xz | |
Merge bitcoin/bitcoin#24507: fix CI: bitcoin-chainstate: Lock `cs_main` to `UnloadBlockIndex`
7a68fe4831787a66986a76306180c7876ecba37f bitcoin-chainstate: Lock cs_main to UnloadBlockIndex (Carl Dong)
Pull request description:
This was introduced because of a silent merge conflict.
ACKs for top commit:
promag:
ACK 7a68fe4831787a66986a76306180c7876ecba37f
jonatack:
ACK 7a68fe4831787a66986a76306180c7876ecba37f
Tree-SHA512: 4c135efd68604452485a129e731675ff5917c157a70c77dd702211d9902c21b3b29380a881723f43ecba4762bc864b036881bb502b3b792e581565dcaa7a7ed4
| -rw-r--r-- | src/bitcoin-chainstate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp index f93197350d..72b8fefcc7 100644 --- a/src/bitcoin-chainstate.cpp +++ b/src/bitcoin-chainstate.cpp @@ -256,7 +256,7 @@ epilogue: } GetMainSignals().UnregisterBackgroundSignalScheduler(); - UnloadBlockIndex(nullptr, chainman); + WITH_LOCK(::cs_main, UnloadBlockIndex(nullptr, chainman)); init::UnsetGlobals(); } |