nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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

16
src/cryptonote_core/blockchain.cpp
View File

@ -154,9 +154,17 @@ bool Blockchain::scan_outputkeys_for_indexes(const txin_to_key& tx_in_to_key, vi
}
if (!found)
{
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
{
// check for partial results and add the rest if needed;
@ -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;
for (size_t i = outputs.size(); i < absolute_offsets.size(); i++)
add_offsets.push_back(absolute_offsets[i]);
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());
}
}