aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Alness <andy@coinbase.com>2014-09-20 16:13:18 -0700
committerAndy Alness <andy@coinbase.com>2014-10-06 21:54:34 -0400
commit9d7cd4c598edfff12f1f80629c9149b3f1cf75a6 (patch)
treec9bc22b523c3e86a7c74ccce3ca23a53b8f20a5e
parent25308337d659108e3320257fb6c1c16d5fe24aa9 (diff)
Don't return an address for invalid pubkeys
-rw-r--r--src/script/standard.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 407baf621d..53ae254d59 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -203,7 +203,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
if (whichType == TX_PUBKEY)
{
- addressRet = CPubKey(vSolutions[0]).GetID();
+ CPubKey pubKey(vSolutions[0]);
+ if (!pubKey.IsValid())
+ return false;
+
+ addressRet = pubKey.GetID();
return true;
}
else if (whichType == TX_PUBKEYHASH)
@@ -237,9 +241,16 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
nRequiredRet = vSolutions.front()[0];
for (unsigned int i = 1; i < vSolutions.size()-1; i++)
{
- CTxDestination address = CPubKey(vSolutions[i]).GetID();
+ CPubKey pubKey(vSolutions[i]);
+ if (!pubKey.IsValid())
+ continue;
+
+ CTxDestination address = pubKey.GetID();
addressRet.push_back(address);
}
+
+ if (addressRet.empty())
+ return false;
}
else
{