diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-07-29 12:54:02 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-07-29 12:54:02 +0100 |
| commit | 878205f143fcae073d84dd82c08cbe1589a065bd (patch) | |
| tree | 004508fb79a94b8586f5075fa5c13ed5e403d60c /src | |
| parent | Merge pull request #2159 (diff) | |
| download | monero-878205f143fcae073d84dd82c08cbe1589a065bd.tar.xz | |
core: fix lock ordering bug at init time
Diffstat (limited to 'src')
| -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 745608b9f..e037a224e 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; |