Merge pull request #2222

878205f1 core: fix lock ordering bug at init time (moneromooo-monero)
7 years ago · a2dd125b1e
parent 9b0daf49db 878205f143
commit a2dd125b1e
1 changed files with 2 additions and 1 deletions
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@ -279,7 +279,8 @@ uint64_t Blockchain::get_current_blockchain_height() const
 bool Blockchain::init(BlockchainDB* db, const bool testnet, const cryptonote::test_options *test_options)
 {
  LOG_PRINT_L3("Blockchain::" << __func__);
-  CRITICAL_REGION_LOCAL(m_blockchain_lock);
+  CRITICAL_REGION_LOCAL(m_tx_pool);
+  CRITICAL_REGION_LOCAL1(m_blockchain_lock);

  bool fakechain = test_options != NULL;