Changeset 227909 in webkit

Timestamp:

Jan 31, 2018, 11:14:51 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

com.apple.WebKit.Storage crashing at com.apple.WebCore: WebCore::SWServerRegistration::removeClientUsingRegistration
​https://bugs.webkit.org/show_bug.cgi?id=182316
<rdar://problem/37025976>

Patch by Youenn Fablet <​youenn@apple.com> on 2018-01-31
Reviewed by Chris Dumez.

SWServer.m_clientToControllingWorker and SWServerRegistration.m_clientsUsingRegistration might currently get out of sync.
This is a defensive fix to ensure storage process will not crash in Release.
We keep the ASSERT as this probably means there is an abnormal situation that other patches might fix.

• workers/service/server/SWServerRegistration.cpp:

(WebCore::SWServerRegistration::removeClientUsingRegistration):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/server/SWServerRegistration.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-31  Youenn Fablet  <youenn@apple.com>
+
+        com.apple.WebKit.Storage crashing at com.apple.WebCore: WebCore::SWServerRegistration::removeClientUsingRegistration
+        https://bugs.webkit.org/show_bug.cgi?id=182316
+        <rdar://problem/37025976>
+
+        Reviewed by Chris Dumez.
+
+        SWServer.m_clientToControllingWorker and SWServerRegistration.m_clientsUsingRegistration might currently get out of sync.
+        This is a defensive fix to ensure storage process will not crash in Release.
+        We keep the ASSERT as this probably means there is an abnormal situation that other patches might fix.
+
+        * workers/service/server/SWServerRegistration.cpp:
+        (WebCore::SWServerRegistration::removeClientUsingRegistration):
+
 2018-01-31  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/workers/service/server/SWServerRegistration.cpp

@@ -182 +182 @@
     auto iterator = m_clientsUsingRegistration.find(clientIdentifier.serverConnectionIdentifier);
     ASSERT(iterator != m_clientsUsingRegistration.end());
+    if (iterator == m_clientsUsingRegistration.end())
+        return;
+
     bool wasRemoved = iterator->value.remove(clientIdentifier.contextIdentifier);
     ASSERT_UNUSED(wasRemoved, wasRemoved);