aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-05 08:16:50 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-05 08:17:02 +0100
commitb1961523f1cdf8f707d5be67f4a20996c90302b9 (patch)
tree5b59441adb8046eec5bd218b541cece95f43e9eb /src/wallet.cpp
parent80ca273b7f34bdb60d44441a379636fa9641ec75 (diff)
parentd3ef9b00ecdc9cc449bea073b1ee54a8dcc6aaf1 (diff)
downloadbitcoin-b1961523f1cdf8f707d5be67f4a20996c90302b9.tar.xz
Merge pull request #3356
d3ef9b0 Prevent empty transactions from being added to vtxPrev (Wladimir J. van der Laan)
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 ab6a926f78..241e937b1b 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);