aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-04 15:30:23 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-04 15:30:23 +0100
commitd3ef9b00ecdc9cc449bea073b1ee54a8dcc6aaf1 (patch)
treed2af0c57251d3b961d7e6aa3e9661a55f136e1e6 /src/wallet.cpp
parent00cfc9f0749daed5137bea78a4234c3d074e8889 (diff)
downloadbitcoin-d3ef9b00ecdc9cc449bea073b1ee54a8dcc6aaf1.tar.xz
Prevent empty transactions from being added to vtxPrev
CWalletTx::AddSupportingTransactions() was adding empty transaction to vtxPrev in some cases. Skip over these. Part one of the solution to #3190. This prevents invalid vtxPrev from entering the wallet, but not current ones being transmitted.
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 14d685d6e2..8b38fc6026 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -765,6 +765,10 @@ void CWalletTx::AddSupportingTransactions()
{
tx = *mapWalletPrev[hash];
}
+ else
+ {
+ continue;
+ }
int nDepth = tx.SetMerkleBranch();
vtxPrev.push_back(tx);