Fix data race: Call close in the IO Service executor in PubSub.cpp

This fixes a data race with the get_con_from_hdl function
Chatterino · Aug 20, 2023 · eac7135 · eac7135
1 parent 381d5c4
commit eac7135
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/src/providers/twitch/PubSubClient.cpp b/src/providers/twitch/PubSubClient.cpp
@@ -45,22 +45,30 @@ void PubSubClient::stop()
 void PubSubClient::close(const std::string &reason,
                          websocketpp::close::status::value code)
 {
-    WebsocketErrorCode ec;
-
-    auto conn = this->websocketClient_.get_con_from_hdl(this->handle_, ec);
-    if (ec)
-    {
-        qCDebug(chatterinoPubSub)
-            << "Error getting con:" << ec.message().c_str();
-        return;
-    }
-
-    conn->close(code, reason, ec);
-    if (ec)
-    {
-        qCDebug(chatterinoPubSub) << "Error closing:" << ec.message().c_str();
-        return;
-    }
+    boost::asio::post(
+        this->websocketClient_.get_io_service().get_executor(),
+        [this, reason, code] {
+            // We need to post this request to the io service executor
+            // to ensure the weak pointer used in get_con_from_hdl is used in a safe way
+            WebsocketErrorCode ec;
+
+            auto conn =
+                this->websocketClient_.get_con_from_hdl(this->handle_, ec);
+            if (ec)
+            {
+                qCDebug(chatterinoPubSub)
+                    << "Error getting con:" << ec.message().c_str();
+                return;
+            }
+
+            conn->close(code, reason, ec);
+            if (ec)
+            {
+                qCDebug(chatterinoPubSub)
+                    << "Error closing:" << ec.message().c_str();
+                return;
+            }
+        });
 }
 
 bool PubSubClient::listen(PubSubListenMessage msg)