nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console_handler: do not let exception past the dor

Browse Source 
Coverity 208373
This commit is contained in:
moneromooo-monero 2020-02-12 13:57:04 +00:00
parent 6b2b1d6368
commit 760ecf2ac8
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/epee/include/console_handler.h
View File

@ -606,11 +606,15 @@ eof:
async_console_handler m_console_handler; async_console_handler m_console_handler;
public: public:
~console_handlers_binder() { ~console_handlers_binder() {
stop_handling(); try
if (m_console_thread.get() != nullptr)
{ {
m_console_thread->join(); stop_handling();
if (m_console_thread.get() != nullptr)
{
m_console_thread->join();
}
} }
catch (const std::exception &e) { /* ignore */ }
} }
bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL) bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)