Merge pull request #3357

4ef92a9 Refuse to retransmit transactions without vins (Wladimir J. van der Laan)

1 files changed, 4 insertions, 1 deletions

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 14d685d6e2..ab6a926f78 100644
--- 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());
     }