DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixes #1964 to catch general exception in z_sendmany and catch

Browse Source 
exceptions as reference-to-const.
This commit is contained in:
Simon
2017-01-03 12:50:19 -08:00
parent 57a0725ae1
commit fce7260811
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wallet/asyncrpcoperation_sendmany.cpp
View File

@@ -86,7 +86,7 @@ AsyncRPCOperation_sendmany::AsyncRPCOperation_sendmany(
isfromzaddr_ = true; isfromzaddr_ = true;
frompaymentaddress_ = addr; frompaymentaddress_ = addr;
spendingkey_ = key; spendingkey_ = key;
} catch (std::runtime_error e) { } catch (const std::runtime_error& e) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("runtime error: ") + e.what()); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("runtime error: ") + e.what());
} }
} }
@@ -106,17 +106,20 @@ void AsyncRPCOperation_sendmany::main() {
try { try {
success = main_impl(); success = main_impl();
} catch (Object objError) { } catch (const Object& objError) {
int code = find_value(objError, "code").get_int(); int code = find_value(objError, "code").get_int();
std::string message = find_value(objError, "message").get_str(); std::string message = find_value(objError, "message").get_str();
set_error_code(code); set_error_code(code);
set_error_message(message); set_error_message(message);
} catch (runtime_error e) { } catch (const runtime_error& e) {
set_error_code(-1); set_error_code(-1);
set_error_message("runtime error: " + string(e.what())); set_error_message("runtime error: " + string(e.what()));
} catch (logic_error e) { } catch (const logic_error& e) {
set_error_code(-1); set_error_code(-1);
set_error_message("logic error: " + string(e.what())); set_error_message("logic error: " + string(e.what()));
} catch (const exception& e) {
set_error_code(-1);
set_error_message("general exception: " + string(e.what()));
} catch (...) { } catch (...) {
set_error_code(-2); set_error_code(-2);
set_error_message("unknown error"); set_error_message("unknown error");
@@ -577,7 +580,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
FormatMoney(plaintext.value, false) FormatMoney(plaintext.value, false)
); );
} catch (const std::exception e) { } catch (const std::exception& e) {
throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error decrypting output note of previous JoinSplit: %s", e.what())); throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error decrypting output note of previous JoinSplit: %s", e.what()));
} }
} }

8
src/wallet/rpcwallet.cpp
View File

@@ -2955,7 +2955,7 @@ Value z_listreceivedbyaddress(const Array& params, bool fHelp)
CZCPaymentAddress address(fromaddress); CZCPaymentAddress address(fromaddress);
try { try {
zaddr = address.Get(); zaddr = address.Get();
} catch (std::runtime_error) { } catch (const std::runtime_error&) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr."); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr.");
} }
@@ -3022,7 +3022,7 @@ Value z_getbalance(const Array& params, bool fHelp)
CZCPaymentAddress address(fromaddress); CZCPaymentAddress address(fromaddress);
try { try {
zaddr = address.Get(); zaddr = address.Get();
} catch (std::runtime_error) { } catch (const std::runtime_error&) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr."); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
} }
if (!pwalletMain->HaveSpendingKey(zaddr)) { if (!pwalletMain->HaveSpendingKey(zaddr)) {
@@ -3226,7 +3226,7 @@ Value z_sendmany(const Array& params, bool fHelp)
CZCPaymentAddress address(fromaddress); CZCPaymentAddress address(fromaddress);
try { try {
zaddr = address.Get(); zaddr = address.Get();
} catch (std::runtime_error) { } catch (const std::runtime_error&) {
// invalid // invalid
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr."); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
} }
@@ -3273,7 +3273,7 @@ Value z_sendmany(const Array& params, bool fHelp)
CZCPaymentAddress zaddr(address); CZCPaymentAddress zaddr(address);
zaddr.Get(); zaddr.Get();
isZaddr = true; isZaddr = true;
} catch (std::runtime_error) { } catch (const std::runtime_error&) {
throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ")+address ); throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ")+address );
} }
} }