From 2cf8b32229966094570c564d03c66c2603b631cc Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sat, 30 Jan 2016 23:33:38 +0000 Subject: wallet: guard against exception in process_blocks If an exception occurs, the thread needs to be joined, or it will be deleted while still live, and terminate the process. --- src/wallet/wallet2.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index d636b0e4b..06cf67e32 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -701,7 +701,15 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re bool error = false; pull_thread = std::thread([&]{pull_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, error);}); - process_blocks(blocks_start_height, blocks, added_blocks); + try + { + process_blocks(blocks_start_height, blocks, added_blocks); + } + catch (...) + { + pull_thread.join(); + throw; + } blocks_fetched += added_blocks; pull_thread.join(); if(!added_blocks) -- cgit v1.2.3