diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:11:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-07 15:11:51 +0200 |
| commit | a2dd125b1e5673b8fdc5343507984c4f68f4c5c3 (patch) | |
| tree | 87924b218bf9d2b432bca8af1bcd053fb5f301c3 /src/cryptonote_core/blockchain.cpp | |
| parent | Merge pull request #2220 (diff) | |
| parent | core: fix lock ordering bug at init time (diff) | |
| download | monero-a2dd125b1e5673b8fdc5343507984c4f68f4c5c3.tar.xz | |
Merge pull request #2222
878205f1 core: fix lock ordering bug at init time (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 815f5b4f3..794dee8aa 100644 --- 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; |