aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-01-11 13:41:27 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2017-01-11 13:59:00 -0800
commit05950427d310654774031764a7141a1a4fd9c6e4 (patch)
tree22460a6608d645b343666046bdb88fb25cd3cd84 /src
parente2e624d9ce54d5d0f1fc0b1934c798804d7d7cff (diff)
parentfe7e593b24678082578e76d8f918d4544713b5f0 (diff)
Merge #9507: Fix use-after-free in CTxMemPool::removeConflicts()
fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
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 4f4540a1fc..373687430b 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -581,8 +581,8 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
const CTransaction &txConflict = *it->second;
if (txConflict != tx)
{
- removeRecursive(txConflict);
ClearPrioritisation(txConflict.GetHash());
+ removeRecursive(txConflict);
}
}
}