console_handler: do not let exception past the dor

Coverity 208373
4 years ago · 760ecf2ac8
parent 6b2b1d6368
commit 760ecf2ac8
1 changed files with 7 additions and 3 deletions
--- 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)