aboutsummaryrefslogtreecommitdiff
path: root/src/txmempool.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-02-05 11:58:47 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2017-02-05 12:08:08 -0800
commit923dc447eaa8e017985b2afbbb12dd1283fbea0e (patch)
tree140832de7142baf9334e2b51b302fc7ab347ad37 /src/txmempool.cpp
parent7821db30e16149a3d8b7f467a4e5ac276af6ccbd (diff)
parent003cd60cc3697df25bb9dfa0bae0616a462af7ab (diff)
Merge #9578: Add missing mempool lock for CalculateMemPoolAncestors
003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
Diffstat (limited to 'src/txmempool.cpp')
-rw-r--r--src/txmempool.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index a1a37dac75..236527a2ba 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -171,6 +171,8 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes
bool CTxMemPool::CalculateMemPoolAncestors(const CTxMemPoolEntry &entry, setEntries &setAncestors, uint64_t limitAncestorCount, uint64_t limitAncestorSize, uint64_t limitDescendantCount, uint64_t limitDescendantSize, std::string &errString, bool fSearchForParents /* = true */) const
{
+ LOCK(cs);
+
setEntries parentHashes;
const CTransaction &tx = entry.GetTx();