kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2062

Browse source 
31417d57 tx_pool: add missing blockchain lock in add_tx (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-06-01 19:33:17 +02:00
commit 4a60e9e66e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cryptonote_core/tx_pool.cpp
View file

@ -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) 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); PERF_TIMER(add_tx);
if (tx.version == 0) if (tx.version == 0)
{ {
@ -224,6 +227,7 @@ namespace cryptonote
meta.do_not_relay = do_not_relay; meta.do_not_relay = do_not_relay;
try try
{ {
CRITICAL_REGION_LOCAL1(m_blockchain);
LockedTXN lock(m_blockchain); LockedTXN lock(m_blockchain);
m_blockchain.add_txpool_tx(tx, meta); m_blockchain.add_txpool_tx(tx, meta);
if (!insert_key_images(tx, kept_by_block)) if (!insert_key_images(tx, kept_by_block))
@ -260,6 +264,7 @@ namespace cryptonote
try try
{ {
CRITICAL_REGION_LOCAL1(m_blockchain);
LockedTXN lock(m_blockchain); LockedTXN lock(m_blockchain);
m_blockchain.remove_txpool_tx(get_transaction_hash(tx)); m_blockchain.remove_txpool_tx(get_transaction_hash(tx));
m_blockchain.add_txpool_tx(tx, meta); m_blockchain.add_txpool_tx(tx, meta);