From dab620b01e0f0516e0aabb813c6357446c51e0fe Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Fri, 17 Mar 2023 09:51:24 +1300
Subject: [PATCH] Http::cleanupPeers: check fulfiller is non-null

resolves #185
---
 src/http.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/http.cpp b/src/http.cpp
index cb7c584..fd35b97 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -131,9 +131,16 @@ kj::Promise<void> Http::cleanupPeers(kj::Timer& timer)
 {
     return timer.afterDelay(15 * kj::SECONDS).then([&]{
         for(EventPeer* p : eventPeers) {
-            // an empty SSE message is a colon followed by two newlines
-            p->pendingOutput.push_back(":\n\n");
-            p->fulfiller->fulfill();
+            // Even single threaded, if load causes this timeout to be serviced
+            // before writeEvents has created a fulfiller, or if an exception
+            // caused the destruction of the promise but attach(peer) hasn't yet
+            // removed it from the eventPeers list, we will see a null fulfiller
+            // here
+            if(p->fulfiller) {
+                // an empty SSE message is a colon followed by two newlines
+                p->pendingOutput.push_back(":\n\n");
+                p->fulfiller->fulfill();
+            }
         }
         return cleanupPeers(timer);
     }).eagerlyEvaluate(nullptr);