Merge #9578: Add missing mempool lock for CalculateMemPoolAncestors

sipa · sipa · commit 923dc447eaa8 · 2017-02-05T12:08:08.000-08:00
003cd60 Add missing mempool lock for CalculateMemPoolAncestors (Matt Corallo)
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();
 

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,8 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes`
`171`	`171`
`172`	`172`	`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`
`173`	`173`	`{`
	`174`	`+ LOCK(cs);`
	`175`	`+`
`174`	`176`	`setEntries parentHashes;`
`175`	`177`	`const CTransaction &tx = entry.GetTx();`
`176`	`178`