diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-02-12 13:57:04 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-02-12 21:05:25 +0000 |
| commit | 760ecf2ac812f4574dd851aa7ac72c3ff1230482 (patch) | |
| tree | 861f7a072dee4099ebf444bd6dd69cd11bbefed7 /contrib/epee/include/console_handler.h | |
| parent | Merge pull request #6048 (diff) | |
| download | monero-760ecf2ac812f4574dd851aa7ac72c3ff1230482.tar.xz | |
console_handler: do not let exception past the dor
Coverity 208373
Diffstat (limited to 'contrib/epee/include/console_handler.h')
| -rw-r--r-- | contrib/epee/include/console_handler.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h index 1b716fca4..a7788aeb8 100644 --- a/contrib/epee/include/console_handler.h +++ b/contrib/epee/include/console_handler.h @@ -606,11 +606,15 @@ eof: async_console_handler m_console_handler; public: ~console_handlers_binder() { - stop_handling(); - if (m_console_thread.get() != nullptr) + try { - 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) |