kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: catch exceptions from get_output_key

Browse source 
This can happen when trying to find an amount that does not exist,
and fixes a core test.
This commit is contained in:
moneromooo-monero 2015-12-25 21:59:26 +00:00
parent 5eef64578b
commit 3cabdb5ef2
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/cryptonote_core/blockchain.cpp
View file

@ -155,7 +155,15 @@ bool Blockchain::scan_outputkeys_for_indexes(const txin_to_key& tx_in_to_key, vi
if (!found) if (!found)
{ {
m_db->get_output_key(tx_in_to_key.amount, absolute_offsets, outputs); try
{
m_db->get_output_key(tx_in_to_key.amount, absolute_offsets, outputs);
}
catch (...)
{
LOG_PRINT_L0("Output does not exist! amount = " << tx_in_to_key.amount);
return false;
}
} }
else else
{ {
@ -167,7 +175,15 @@ bool Blockchain::scan_outputkeys_for_indexes(const txin_to_key& tx_in_to_key, vi
std::vector<output_data_t> add_outputs; std::vector<output_data_t> add_outputs;
for (size_t i = outputs.size(); i < absolute_offsets.size(); i++) for (size_t i = outputs.size(); i < absolute_offsets.size(); i++)
add_offsets.push_back(absolute_offsets[i]); add_offsets.push_back(absolute_offsets[i]);
m_db->get_output_key(tx_in_to_key.amount, add_offsets, add_outputs); try
{
m_db->get_output_key(tx_in_to_key.amount, add_offsets, add_outputs);
}
catch (...)
{
LOG_PRINT_L0("Output does not exist! amount = " << tx_in_to_key.amount);
return false;
}
outputs.insert(outputs.end(), add_outputs.begin(), add_outputs.end()); outputs.insert(outputs.end(), add_outputs.begin(), add_outputs.end());
} }
} }