Merge pull request #3357

4ef92a9 Refuse to retransmit transactions without vins (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2013-12-04 18:28:50 +01:00
commit 80ca273b7f
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -895,7 +895,10 @@ void CWalletTx::RelayWalletTransaction()
{ {
BOOST_FOREACH(const CMerkleTx& tx, vtxPrev) BOOST_FOREACH(const CMerkleTx& tx, vtxPrev)
{ {
if (!tx.IsCoinBase()) // Important: versions of bitcoin before 0.8.6 had a bug that inserted
// empty transactions into the vtxPrev, which will cause the node to be
// banned when retransmitted, hence the check for !tx.vin.empty()
if (!tx.IsCoinBase() && !tx.vin.empty())
if (tx.GetDepthInMainChain() == 0) if (tx.GetDepthInMainChain() == 0)
RelayTransaction((CTransaction)tx, tx.GetHash()); RelayTransaction((CTransaction)tx, tx.GetHash());
} }