Changeset 225581 in webkit

Timestamp:

Dec 6, 2017 11:00:59 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r225537): Crash in WebCore::SWServerWorker::setHasPendingEvents(bool) + 68
​https://bugs.webkit.org/show_bug.cgi?id=180481

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-06
Reviewed by Chris Dumez.

Replacing ASSERT by if null check since there is no strong guarantee right now that there is a registration
in SWServer registration map associated to a SWServerWorker.

• workers/service/server/SWServerWorker.cpp:

(WebCore::SWServerWorker::setHasPendingEvents):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-06  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r225537): Crash in WebCore::SWServerWorker::setHasPendingEvents(bool) + 68
+        https://bugs.webkit.org/show_bug.cgi?id=180481
+
+        Reviewed by Chris Dumez.
+
+        Replacing ASSERT by if null check since there is no strong guarantee right now that there is a registration
+        in SWServer registration map associated to a SWServerWorker.
+
+        * workers/service/server/SWServerWorker.cpp:
+        (WebCore::SWServerWorker::setHasPendingEvents):
+
 2017-12-06  Chris Dumez  <cdumez@apple.com>
 

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

@@ -142 +142 @@
     // Do tryClear/tryActivate, as per https://w3c.github.io/ServiceWorker/#wait-until-method.
     auto* registration = m_server.getRegistration(m_registrationKey);
-    ASSERT(registration);
+    if (!registration)
+        return;
+
     if (registration->isUninstalling() && registration->tryClear())
         return;