aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-05-31 22:50:12 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-05-31 22:55:13 +0100
commit31417d57da2441a7dca0752a902c34fbc8d8a1f1 (patch)
tree18078827f1f07f72a4784c585152d89b13d9a51f /src/cryptonote_core
parentMerge pull request #2053 (diff)
downloadmonero-31417d57da2441a7dca0752a902c34fbc8d8a1f1.tar.xz
tx_pool: add missing blockchain lock in add_tx
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/tx_pool.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 30aed50f9..c837ed22b 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -107,6 +107,9 @@ namespace cryptonote
//---------------------------------------------------------------------------------
bool tx_memory_pool::add_tx(transaction &tx, /*const crypto::hash& tx_prefix_hash,*/ const crypto::hash &id, size_t blob_size, tx_verification_context& tvc, bool kept_by_block, bool relayed, bool do_not_relay, uint8_t version)
{
+ // this should already be called with that lock, but let's make it explicit for clarity
+ CRITICAL_REGION_LOCAL(m_transactions_lock);
+
PERF_TIMER(add_tx);
if (tx.version == 0)
{
@@ -224,6 +227,7 @@ namespace cryptonote
meta.do_not_relay = do_not_relay;
try
{
+ CRITICAL_REGION_LOCAL1(m_blockchain);
LockedTXN lock(m_blockchain);
m_blockchain.add_txpool_tx(tx, meta);
if (!insert_key_images(tx, kept_by_block))
@@ -260,6 +264,7 @@ namespace cryptonote
try
{
+ CRITICAL_REGION_LOCAL1(m_blockchain);
LockedTXN lock(m_blockchain);
m_blockchain.remove_txpool_tx(get_transaction_hash(tx));
m_blockchain.add_txpool_tx(tx, meta);