Merge pull request #7200

laanwj · laanwj · commit dc511dcfd9ea · 2015-12-14T13:08:35.000+01:00
d812daf fix logic for error log (accraze) c611acc wallet: check if tx scriptPubKey is unspendable (accraze) b6915b8 checks for null data transaction before debug.log (accraze)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1034,7 +1034,8 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
 
         // In either case, we need to get the destination address
         CTxDestination address;
-        if (!ExtractDestination(txout.scriptPubKey, address))
+
+        if (!ExtractDestination(txout.scriptPubKey, address) && !txout.scriptPubKey.IsUnspendable())
         {
             LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
                      this->GetHash().ToString());

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,8 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,`
`1034`	`1034`
`1035`	`1035`	`// In either case, we need to get the destination address`
`1036`	`1036`	`CTxDestination address;`
`1037`		`- if (!ExtractDestination(txout.scriptPubKey, address))`
	`1037`	`+`
	`1038`	`+ if (!ExtractDestination(txout.scriptPubKey, address) && !txout.scriptPubKey.IsUnspendable())`
`1038`	`1039`	`{`
`1039`	`1040`	`LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",`
`1040`	`1041`	`this->GetHash().ToString());`