Changeset 240974 in webkit

Timestamp:

Feb 5, 2019 7:38:20 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Protect globalWebSocketStreamMap with a Lock
​https://bugs.webkit.org/show_bug.cgi?id=194224
<rdar://problem/47581081>

Reviewed by Ryosuke Niwa.

• WebProcess/Network/WebSocketStream.cpp:

(WebKit::WebSocketStream::streamWithIdentifier):
(WebKit::WebSocketStream::networkProcessCrashed):
(WebKit::WebSocketStream::WebSocketStream):
(WebKit::WebSocketStream::~WebSocketStream):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Network/WebSocketStream.cpp (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-05  Alex Christensen  <achristensen@webkit.org>
+
+        Protect globalWebSocketStreamMap with a Lock
+        https://bugs.webkit.org/show_bug.cgi?id=194224
+        <rdar://problem/47581081>
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebProcess/Network/WebSocketStream.cpp:
+        (WebKit::WebSocketStream::streamWithIdentifier):
+        (WebKit::WebSocketStream::networkProcessCrashed):
+        (WebKit::WebSocketStream::WebSocketStream):
+        (WebKit::WebSocketStream::~WebSocketStream):
+
 2019-02-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/Network/WebSocketStream.cpp

@@ -42 +42 @@
 using namespace WebCore;
 
+static Lock globalWebSocketStreamMapLock;
 static HashMap<uint64_t, WebSocketStream*>& globalWebSocketStreamMap()
 {
@@ -50 +51 @@
 WebSocketStream* WebSocketStream::streamWithIdentifier(uint64_t identifier)
 {
+    LockHolder locker(globalWebSocketStreamMapLock);
     return globalWebSocketStreamMap().get(identifier);
 }
@@ -55 +57 @@
 void WebSocketStream::networkProcessCrashed()
 {
-    for (auto& stream : globalWebSocketStreamMap().values()) {
+    Vector<RefPtr<WebSocketStream>> sockets;
+    {
+        LockHolder locker(globalWebSocketStreamMapLock);
+        sockets.reserveInitialCapacity(globalWebSocketStreamMap().size());
+        for (auto& stream : globalWebSocketStreamMap().values())
+            sockets.uncheckedAppend(stream);
+    }
+
+    for (auto& stream : sockets) {
         for (auto& callback : stream->m_sendDataCallbacks.values())
             callback(false);
@@ -61 +71 @@
             callback(false, false);
         stream->m_client.didFailSocketStream(*stream, SocketStreamError(0, { }, "Network process crashed."));
+        stream = nullptr;
     }
 
+    LockHolder locker(globalWebSocketStreamMapLock);
     globalWebSocketStreamMap().clear();
 }
@@ -77 +89 @@
     WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::CreateSocketStream(url, sessionID, cachePartition, identifier()), 0);
 
+    LockHolder locker(globalWebSocketStreamMapLock);
     ASSERT(!globalWebSocketStreamMap().contains(identifier()));
     globalWebSocketStreamMap().set(identifier(), this);
@@ -83 +96 @@
 WebSocketStream::~WebSocketStream()
 {
+    LockHolder locker(globalWebSocketStreamMapLock);
     ASSERT(globalWebSocketStreamMap().contains(identifier()));
     globalWebSocketStreamMap().remove(identifier());