aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-09-02 11:31:19 +0200
committerRiccardo Spagni <ric@spagni.net>2017-09-02 11:31:19 +0200
commitc919ca4f1d4f629929c2aaa06551c37c28e19946 (patch)
tree4a03944482b0d7ad9984d47d5c8b110aa70ec64a /src
parentMerge pull request #2372 (diff)
parenttx_pool: wrap tx meta updates in a LockedTXN (diff)
downloadmonero-c919ca4f1d4f629929c2aaa06551c37c28e19946.tar.xz
Merge pull request #2374
e72e625e tx_pool: wrap tx meta updates in a LockedTXN (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/tx_pool.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 265a4ca3e..68e0b556f 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -863,6 +863,9 @@ namespace cryptonote
std::unordered_set<crypto::key_image> k_images;
LOG_PRINT_L2("Filling block template, median size " << median_size << ", " << m_txs_by_fee_and_receive_time.size() << " txes in the pool");
+
+ LockedTXN lock(m_blockchain);
+
auto sorted_it = m_txs_by_fee_and_receive_time.begin();
while (sorted_it != m_txs_by_fee_and_receive_time.end())
{