monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

simplewallet: replace assert(m_wallet) with error out

Browse source
This commit is contained in:
stoffu 2017-06-20 08:33:15 +09:00
parent 8da82256d4
commit 8df918f8c7
No known key found for this signature in database
GPG key ID: 41DAB8343A9EC012
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/simplewallet/simplewallet.cpp
View file

@ -1193,7 +1193,11 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
bool r = open_wallet(vm); bool r = open_wallet(vm);
CHECK_AND_ASSERT_MES(r, false, tr("failed to open account")); CHECK_AND_ASSERT_MES(r, false, tr("failed to open account"));
} }
assert(m_wallet); if (!m_wallet)
{
fail_msg_writer() << tr("wallet is null");
return false;
}
// set --trusted-daemon if local // set --trusted-daemon if local
try try
@ -1573,7 +1577,11 @@ bool simple_wallet::start_mining(const std::vector<std::string>& args)
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
assert(m_wallet); if (!m_wallet)
{
fail_msg_writer() << tr("wallet is null");
return true;
}
COMMAND_RPC_START_MINING::request req = AUTO_VAL_INIT(req); COMMAND_RPC_START_MINING::request req = AUTO_VAL_INIT(req);
req.miner_address = m_wallet->get_account().get_public_address_str(m_wallet->testnet()); req.miner_address = m_wallet->get_account().get_public_address_str(m_wallet->testnet());
@ -1616,7 +1624,11 @@ bool simple_wallet::stop_mining(const std::vector<std::string>& args)
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
assert(m_wallet); if (!m_wallet)
{
fail_msg_writer() << tr("wallet is null");
return true;
}
COMMAND_RPC_STOP_MINING::request req; COMMAND_RPC_STOP_MINING::request req;
COMMAND_RPC_STOP_MINING::response res; COMMAND_RPC_STOP_MINING::response res;
bool r = net_utils::invoke_http_json("/stop_mining", req, res, m_http_client); bool r = net_utils::invoke_http_json("/stop_mining", req, res, m_http_client);
@ -1633,7 +1645,11 @@ bool simple_wallet::save_bc(const std::vector<std::string>& args)
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
assert(m_wallet); if (!m_wallet)
{
fail_msg_writer() << tr("wallet is null");
return true;
}
COMMAND_RPC_SAVE_BC::request req; COMMAND_RPC_SAVE_BC::request req;
COMMAND_RPC_SAVE_BC::response res; COMMAND_RPC_SAVE_BC::response res;
bool r = net_utils::invoke_http_json("/save_bc", req, res, m_http_client); bool r = net_utils::invoke_http_json("/save_bc", req, res, m_http_client);
@ -3326,7 +3342,11 @@ bool simple_wallet::check_tx_key(const std::vector<std::string> &args_)
if (!try_connect_to_daemon()) if (!try_connect_to_daemon())
return true; return true;
assert(m_wallet); if (!m_wallet)
{
fail_msg_writer() << tr("wallet is null");
return true;
}
cryptonote::blobdata txid_data; cryptonote::blobdata txid_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(local_args[0], txid_data) || txid_data.size() != sizeof(crypto::hash)) if(!epee::string_tools::parse_hexstr_to_binbuff(local_args[0], txid_data) || txid_data.size() != sizeof(crypto::hash))
{ {