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

fe7e593 Fix use-after-free in CTxMemPool::removeConflicts() (Suhas Daftuar)
shi7 · Jan 11, 2017 · 0595042 · 0595042
2 parents e2e624d + fe7e593
commit 0595042
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
             }
         }
     }