From d16ee316c9a15eafe5b25d2997533116c03bbd2c Mon Sep 17 00:00:00 2001
From: Sandip Patel <sandip@knackroot.com>
Date: Tue, 12 Nov 2019 12:08:29 +0530
Subject: [PATCH] Fix memory leak. Not all tasks are deleted in thread_d dtor

---
 src/thread/thread.cpp   |  6 +++++-
 src/thread/thread_d.hpp | 15 +++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/thread/thread.cpp b/src/thread/thread.cpp
index 7b899bb..25ba77c 100755
--- a/src/thread/thread.cpp
+++ b/src/thread/thread.cpp
@@ -110,7 +110,7 @@ namespace fc {
 
    thread::~thread() {
       //wlog( "my ${n}", ("n",name()) );
-      if( my )
+      if( my && is_running() )
       {
         // wlog( "calling quit() on ${n}",("n",my->name) );
         quit(); // deletes `my`
@@ -333,6 +333,10 @@ namespace fc {
 
    void thread::async_task( task_base* t, const priority& p, const time_point& tp ) {
       assert(my);
+      if( !is_running() )
+      {
+         FC_THROW_EXCEPTION( canceled_exception, "Thread is not running.");
+      }
       t->_when = tp;
      // slog( "when %lld", t->_when.time_since_epoch().count() );
      // slog( "delay %lld", (tp - fc::time_point::now()).count() );
diff --git a/src/thread/thread_d.hpp b/src/thread/thread_d.hpp
index 74b59d3..8e36b14 100755
--- a/src/thread/thread_d.hpp
+++ b/src/thread/thread_d.hpp
@@ -42,7 +42,14 @@ namespace fc {
               delete current;
               fc::context* temp;
               for (fc::context* ready_context : ready_heap)
-                delete ready_context;
+              {
+                  if (ready_context->cur_task)
+                  {
+                     ready_context->cur_task->release();
+                     ready_context->cur_task = nullptr;
+                  }
+                  delete ready_context;
+              }
               ready_heap.clear();
               while (blocked)
               {
@@ -509,10 +516,10 @@ namespace fc {
 
               next->_set_active_context( current );
               current->cur_task = next;
-              next->run();
+              fc::shared_ptr<task_base> next_ptr(next);
+              next_ptr->run();
               current->cur_task = 0;
-              next->_set_active_context(0);
-              next->release();
+              next_ptr->_set_active_context(0);
               current->reinitialize();
            }