http: Release work queue after event base finish (btc#19033) (#38)

* gui: encrypt wallet dialog, update to AVN (#33)

* http: Release work queue after event base finish (btc#19033)

backport of bitcoin#19033.

This fixes a race between http_request_cb and StopHTTPServer where
the work queue is used after release. - promag @ bitcoin.

(cherry picked from commit 994f5b4)

src/httpserver.cpp

@@ -110,7 +110,7 @@ class WorkQueue
     bool Enqueue(WorkItem* item)
     {
         std::unique_lock<std::mutex> lock(cs);
-        if (queue.size() >= maxDepth) {
+        if (!running || queue.size() >= maxDepth) {
             return false;
         }
         queue.emplace_back(std::unique_ptr<WorkItem>(item));
@@ -127,7 +127,7 @@ class WorkQueue
                 std::unique_lock<std::mutex> lock(cs);
                 while (running && queue.empty())
                     cond.wait(lock);
-                if (!running)
+                if (!running && queue.empty())
                     break;
                 i = std::move(queue.front());
                 queue.pop_front();
@@ -478,8 +478,6 @@ void StopHTTPServer()
     if (workQueue) {
         LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
         workQueue->WaitExit();
-        delete workQueue;
-        workQueue = nullptr;
     }
     if (eventBase) {
         LogPrint(BCLog::HTTP, "Waiting for HTTP event thread to exit\n");
@@ -505,6 +503,10 @@ void StopHTTPServer()
         event_base_free(eventBase);
         eventBase = nullptr;
     }
+    if (workQueue) {
+        delete workQueue;
+        workQueue = nullptr;
+    }
     LogPrint(BCLog::HTTP, "Stopped HTTP server\n");
 }