Merge #9578: Add missing mempool lock for CalculateMemPoolAncestors

003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
shi7 · Feb 5, 2017 · 923dc44 · 923dc44
2 parents 7821db3 + 003cd60
commit 923dc44
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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();