Merge #9507: Fix use-after-free in CTxMemPool::removeConflicts()

fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
2017-01-11 13:41:27 -08:00 · 2017-01-11 13:41:27 -08:00 · 05950427d3
parent e2e624d9ce fe7e593b24
commit 05950427d3
1 changed files with 1 additions and 1 deletions
--- 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);
            }
        }
    }