Merge pull request #3356

laanwj · laanwj · commit b1961523f1cd · 2013-12-05T08:17:02.000+01:00
d3ef9b0 Prevent empty transactions from being added to vtxPrev (Wladimir J. van der Laan)
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -765,6 +765,10 @@ void CWalletTx::AddSupportingTransactions()`
`765`	`765`	`{`
`766`	`766`	`tx = *mapWalletPrev[hash];`
`767`	`767`	`}`
	`768`	`+ else`
	`769`	`+ {`
	`770`	`+ continue;`
	`771`	`+ }`
`768`	`772`
`769`	`773`	`int nDepth = tx.SetMerkleBranch();`
`770`	`774`	`vtxPrev.push_back(tx);`