Skip to content

Fix crash in validateaddress with -disablewallet #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crowning- wants to merge 5 commits into from
Closed

Fix crash in validateaddress with -disablewallet #696

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a07528
UI: URL in splash-screen changed
crowning- Jan 25, 2016
d3c73be
Merge remote-tracking branch 'upstream/v0.12.1.x' into v0.12.1.x
crowning- Jan 28, 2016
b5ca1f3
Merge remote-tracking branch 'upstream/v0.12.1.x' into v0.12.1.x
crowning- Feb 1, 2016
46926b7
Merge remote-tracking branch 'upstream/v0.12.1.x' into v0.12.1.x
crowning- Feb 14, 2016
5db6e81
Fix crash in validateaddress with -disablewallet
crowning- Feb 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions src/rpcmisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,10 @@ class DescribeAddressVisitor : public boost::static_visitor<Object>
CPubKey vchPubKey;
obj.push_back(Pair("isscript", false));
if (mine == ISMINE_SPENDABLE) {
pwalletMain->GetPubKey(keyID, vchPubKey);
obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
if (pwalletMain && pwalletMain->GetPubKey(keyID, vchPubKey)) {
obj.push_back(Pair("pubkey", HexStr(vchPubKey)));
obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
}
}
return obj;
}
Expand All @@ -179,19 +180,20 @@ class DescribeAddressVisitor : public boost::static_visitor<Object>
obj.push_back(Pair("isscript", true));
if (mine != ISMINE_NO) {
CScript subscript;
pwalletMain->GetCScript(scriptID, subscript);
std::vector<CTxDestination> addresses;
txnouttype whichType;
int nRequired;
ExtractDestinations(subscript, whichType, addresses, nRequired);
obj.push_back(Pair("script", GetTxnOutputType(whichType)));
obj.push_back(Pair("hex", HexStr(subscript.begin(), subscript.end())));
Array a;
BOOST_FOREACH(const CTxDestination& addr, addresses)
a.push_back(CBitcoinAddress(addr).ToString());
obj.push_back(Pair("addresses", a));
if (whichType == TX_MULTISIG)
obj.push_back(Pair("sigsrequired", nRequired));
if (pwalletMain && pwalletMain->GetCScript(scriptID, subscript)){
std::vector<CTxDestination> addresses;
txnouttype whichType;
int nRequired;
ExtractDestinations(subscript, whichType, addresses, nRequired);
obj.push_back(Pair("script", GetTxnOutputType(whichType)));
obj.push_back(Pair("hex", HexStr(subscript.begin(), subscript.end())));
Array a;
BOOST_FOREACH(const CTxDestination& addr, addresses)
a.push_back(CBitcoinAddress(addr).ToString());
obj.push_back(Pair("addresses", a));
if (whichType == TX_MULTISIG)
obj.push_back(Pair("sigsrequired", nRequired));
}
}
return obj;
}
Expand Down