LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #4954

Browse source 
9d7cd4c Don't return an address for invalid pubkeys (Andy Alness)
This commit is contained in:
Wladimir J. van der Laan 2014-10-07 08:38:40 +02:00
commit 953f16cb4e
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/script/standard.cpp
View file

@ -203,7 +203,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
if (whichType == TX_PUBKEY) if (whichType == TX_PUBKEY)
{ {
addressRet = CPubKey(vSolutions[0]).GetID(); CPubKey pubKey(vSolutions[0]);
if (!pubKey.IsValid())
return false;
addressRet = pubKey.GetID();
return true; return true;
} }
else if (whichType == TX_PUBKEYHASH) else if (whichType == TX_PUBKEYHASH)
@ -237,9 +241,16 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
nRequiredRet = vSolutions.front()[0]; nRequiredRet = vSolutions.front()[0];
for (unsigned int i = 1; i < vSolutions.size()-1; i++) 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); addressRet.push_back(address);
} }
if (addressRet.empty())
return false;
} }
else else
{ {