mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-27 05:13:25 +01:00
Merge pull request #4987
841a6acd
wallet2: fix accessing unwound stack on exception (moneromooo-monero)
This commit is contained in:
commit
538043bdcd
@ -2800,13 +2800,16 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
|
|||||||
bool first = true;
|
bool first = true;
|
||||||
while(m_run.load(std::memory_order_relaxed))
|
while(m_run.load(std::memory_order_relaxed))
|
||||||
{
|
{
|
||||||
|
uint64_t next_blocks_start_height;
|
||||||
|
std::vector<cryptonote::block_complete_entry> next_blocks;
|
||||||
|
std::vector<parsed_block> next_parsed_blocks;
|
||||||
|
bool error;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// pull the next set of blocks while we're processing the current one
|
// pull the next set of blocks while we're processing the current one
|
||||||
uint64_t next_blocks_start_height;
|
error = false;
|
||||||
std::vector<cryptonote::block_complete_entry> next_blocks;
|
next_blocks.clear();
|
||||||
std::vector<parsed_block> next_parsed_blocks;
|
next_parsed_blocks.clear();
|
||||||
bool error = false;
|
|
||||||
added_blocks = 0;
|
added_blocks = 0;
|
||||||
if (!first && blocks.empty())
|
if (!first && blocks.empty())
|
||||||
{
|
{
|
||||||
@ -2844,6 +2847,11 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
|
|||||||
start_height = stop_height;
|
start_height = stop_height;
|
||||||
throw std::runtime_error(""); // loop again
|
throw std::runtime_error(""); // loop again
|
||||||
}
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
MERROR("Error parsing blocks: " << e.what());
|
||||||
|
error = true;
|
||||||
|
}
|
||||||
blocks_fetched += added_blocks;
|
blocks_fetched += added_blocks;
|
||||||
}
|
}
|
||||||
waiter.wait(&tpool);
|
waiter.wait(&tpool);
|
||||||
|
Loading…
Reference in New Issue
Block a user