Fix #794. Only remove transactions from memory pool when they're actually in the memory pool.

This commit is contained in:
Chris Moore 2012-02-09 05:21:41 -08:00
parent 328b26d40b
commit 74f28bf1fd

View File

@ -618,11 +618,15 @@ bool CTransaction::RemoveFromMemoryPool()
// Remove transaction from memory pool // Remove transaction from memory pool
CRITICAL_BLOCK(cs_mapTransactions) CRITICAL_BLOCK(cs_mapTransactions)
{ {
BOOST_FOREACH(const CTxIn& txin, vin) uint256 hash = GetHash();
mapNextTx.erase(txin.prevout); if (mapTransactions.count(hash))
mapTransactions.erase(GetHash()); {
nTransactionsUpdated++; BOOST_FOREACH(const CTxIn& txin, vin)
--nPooledTx; mapNextTx.erase(txin.prevout);
mapTransactions.erase(hash);
nTransactionsUpdated++;
--nPooledTx;
}
} }
return true; return true;
} }