diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-14 13:08:26 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-14 13:08:35 +0100 |
| commit | dc511dcfd9eaa82a773d0a402b1500c3fd9113e0 (patch) | |
| tree | 13c9fa5ebf485a416a5f0e3d207c8fce7ca2b5fe | |
| parent | 5f3c670d1222a6a75236b0201946e36875a80c25 (diff) | |
| parent | d812daf967ba4173bfa1c37eeb4ab7a0ccc4df25 (diff) | |
| download | bitcoin-dc511dcfd9eaa82a773d0a402b1500c3fd9113e0.tar.xz | |
Merge pull request #7200
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)
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index f3911f314a..2cbb89e5a8 100644 --- 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()); |