wallet-rpc.getaddress: throw if index is out of bound

This commit is contained in:
stoffu 2018-06-21 10:49:03 +09:00 committed by moneromooo-monero
parent 223429f0fd
commit 47b42f8b01
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3

View file

@ -362,6 +362,7 @@ namespace tools
if (!m_wallet) return not_open(er); if (!m_wallet) return not_open(er);
try try
{ {
THROW_WALLET_EXCEPTION_IF(req.account_index >= m_wallet->get_num_subaddress_accounts(), error::account_index_outofbound);
res.addresses.clear(); res.addresses.clear();
std::vector<uint32_t> req_address_index; std::vector<uint32_t> req_address_index;
if (req.address_index.empty()) if (req.address_index.empty())
@ -377,6 +378,7 @@ namespace tools
m_wallet->get_transfers(transfers); m_wallet->get_transfers(transfers);
for (uint32_t i : req_address_index) for (uint32_t i : req_address_index)
{ {
THROW_WALLET_EXCEPTION_IF(i >= m_wallet->get_num_subaddresses(req.account_index), error::address_index_outofbound);
res.addresses.resize(res.addresses.size() + 1); res.addresses.resize(res.addresses.size() + 1);
auto& info = res.addresses.back(); auto& info = res.addresses.back();
const cryptonote::subaddress_index index = {req.account_index, i}; const cryptonote::subaddress_index index = {req.account_index, i};