WebSocketChannel::CleanupConnection should run on the socket thread

1 files changed, 10 insertions, 0 deletions

diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index f94c1d9ca9..679252500f 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -2313,6 +2313,16 @@ WebSocketChannel::CleanupConnection()
 {
   LOG(("WebSocketChannel::CleanupConnection() %p", this));
 
+  // This should run on the Socket Thread to prevent potential races.
+  bool onSocketThread;
+  nsresult rv = mSocketThread->IsOnCurrentThread(&onSocketThread);
+  if (NS_SUCCEEDED(rv) && !onSocketThread) {
+    mSocketThread->Dispatch(
+        NewRunnableMethod(this, &WebSocketChannel::CleanupConnection),
+        NS_DISPATCH_NORMAL);
+    return;
+  }
+
   if (mLingeringCloseTimer) {
     mLingeringCloseTimer->Cancel();
     mLingeringCloseTimer = nullptr;