From 9b98a6ac8f750f5d786fe9a3a561373ca64e5049 Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Fri, 2 Feb 2018 16:16:43 +0000
Subject: [PATCH] threadpool: catch exceptions in dtor, to avoid terminate

If an exception is thrown, it is ignored. While this may hide
a bug, this should only be system exceptions in boost, which
is pretty unlikely. Morever, wait should be called manually
before the dtor anyway. Add an error message if the dtor has
to wait in case some such cases creep in so they get fixed.

Coverity 182538
---
 src/common/threadpool.cpp | 18 ++++++++++++++++++
 src/common/threadpool.h   |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/common/threadpool.cpp b/src/common/threadpool.cpp
index 7fd16ceaf..51e071577 100644
--- a/src/common/threadpool.cpp
+++ b/src/common/threadpool.cpp
@@ -25,6 +25,7 @@
 // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "misc_log_ex.h"
 #include "common/threadpool.h"
 
 #include <cassert>
@@ -81,6 +82,23 @@ int threadpool::get_max_concurrency() {
   return max;
 }
 
+threadpool::waiter::~waiter()
+{
+  {
+    boost::unique_lock<boost::mutex> lock(mt);
+    if (num)
+      MERROR("wait should have been called before waiter dtor - waiting now");
+  }
+  try
+  {
+    wait();
+  }
+  catch (const std::exception &e)
+  {
+    /* ignored */
+  }
+}
+
 void threadpool::waiter::wait() {
   boost::unique_lock<boost::mutex> lock(mt);
   while(num) cv.wait(lock);
diff --git a/src/common/threadpool.h b/src/common/threadpool.h
index a0e53b011..34152541c 100644
--- a/src/common/threadpool.h
+++ b/src/common/threadpool.h
@@ -34,6 +34,7 @@
 #include <functional>
 #include <utility>
 #include <vector>
+#include <stdexcept>
 
 namespace tools
 {
@@ -57,7 +58,7 @@ public:
     void dec();
     void wait();  //! Wait for a set of tasks to finish.
     waiter() : num(0){}
-    ~waiter() { wait(); }
+    ~waiter();
   };
 
   // Submit a task to the pool. The waiter pointer may be