diff options
| author | Pieter Wuille <[email protected]> | 2017-01-11 13:41:27 -0800 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2017-01-11 13:59:00 -0800 |
| commit | 05950427d310654774031764a7141a1a4fd9c6e4 (patch) | |
| tree | 22460a6608d645b343666046bdb88fb25cd3cd84 /src/txmempool.cpp | |
| parent | Merge #7871: Manual block file pruning. (diff) | |
| parent | Fix use-after-free in CTxMemPool::removeConflicts() (diff) | |
| download | discoin-05950427d310654774031764a7141a1a4fd9c6e4.tar.xz discoin-05950427d310654774031764a7141a1a4fd9c6e4.zip | |
Merge #9507: Fix use-after-free in CTxMemPool::removeConflicts()
fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 4f4540a1f..373687430 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); } } } |