Merge pull request #3804

ba51c7d Fix null pointer in IsTrusted() (Cozz Lovan)
2014-03-05 19:39:34 +01:00 · 2014-03-05 19:39:34 +01:00 · f5352da490
commit f5352da490
parent 334bd22e75 ba51c7da40
1 changed files with 3 additions and 1 deletions
--- a/src/wallet.h
+++ b/src/wallet.h
@ -675,8 +675,10 @@ public:
        {
            // Transactions not sent by us: not trusted
            const CWalletTx* parent = pwallet->GetWalletTx(txin.prevout.hash);
+            if (parent == NULL)
+                return false;
            const CTxOut& parentOut = parent->vout[txin.prevout.n];
-            if (parent == NULL || !pwallet->IsMine(parentOut))
+            if (!pwallet->IsMine(parentOut))
                return false;
        }
        return true;