aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-06-20 15:21:21 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-06-20 15:21:27 +0200
commit1f86d64f6d87b46ee80c6d66b0c3c01c5095aaea (patch)
treeb18c865874a466a2a99cee8eb97b390353e92a50 /src
parent94ab58b5ccda809c552040121a295a0e0f6efcec (diff)
parentad0752e41f7804fd1d0e639c51e927ed4f430e09 (diff)
Merge #8220: Stop trimming when mapTx is empty
ad0752e Stop trimming when mapTx is empty (Pieter Wuille)
Diffstat (limited to 'src')
-rw-r--r--src/txmempool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 205ffd6379..18c54b08bc 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -1075,7 +1075,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
unsigned nTxnRemoved = 0;
CFeeRate maxFeeRateRemoved(0);
- while (DynamicMemoryUsage() > sizelimit) {
+ while (!mapTx.empty() && DynamicMemoryUsage() > sizelimit) {
indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin();
// We set the new mempool min fee to the feerate of the removed set, plus the