Merge pull request #3357

laanwj · laanwj · commit 80ca273b7f34 · 2013-12-04T18:29:00.000+01:00
4ef92a9 Refuse to retransmit transactions without vins (Wladimir J. van der Laan)
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -895,7 +895,10 @@ void CWalletTx::RelayWalletTransaction()
 {
     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)
                 RelayTransaction((CTransaction)tx, tx.GetHash());
     }

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,10 @@ void CWalletTx::RelayWalletTransaction()`
`895`	`895`	`{`
`896`	`896`	`BOOST_FOREACH(const CMerkleTx& tx, vtxPrev)`
`897`	`897`	`{`
`898`		`- if (!tx.IsCoinBase())`
	`898`	`+ // Important: versions of bitcoin before 0.8.6 had a bug that inserted`
	`899`	`+ // empty transactions into the vtxPrev, which will cause the node to be`
	`900`	`+ // banned when retransmitted, hence the check for !tx.vin.empty()`
	`901`	`+ if (!tx.IsCoinBase() && !tx.vin.empty())`
`899`	`902`	`if (tx.GetDepthInMainChain() == 0)`
`900`	`903`	`RelayTransaction((CTransaction)tx, tx.GetHash());`
`901`	`904`	`}`