Changeset 256317 in webkit

Timestamp:

Feb 11, 2020 10:26:51 AM (4 years ago)

Author:

youenn@apple.com

Message:

REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
​https://bugs.webkit.org/show_bug.cgi?id=207521
<rdar://problem/59331313>

Reviewed by Eric Carlson.

Source/WebKit:

Covered by debug assertion not hit in layout tests.

• WebProcess/Network/webrtc/WebMDNSRegister.cpp:

(WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.

LayoutTests:

• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Network/webrtc/WebMDNSRegister.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-02-11  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+        https://bugs.webkit.org/show_bug.cgi?id=207521
+        <rdar://problem/59331313>
+
+        Reviewed by Eric Carlson.
+
+        * platform/mac-wk2/TestExpectations:
+
 2020-02-11  Jacob Uphoff  <jacob_uphoff@apple.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1015 +1015 @@
 
 webkit.org/b/207518 tiled-drawing/simple-document-with-margin-tiles.html [ Pass Failure ]
-
-webkit.org/b/207521 [ Mojave Debug ] webrtc/peerconnection-page-cache-long.html [ Pass Crash ]

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-11  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r256009): [ Mojave wk2 Debug ] ASSERTION FAILED: Completion handler should always be called under WebKit::WebMDNSRegister::PendingRegistration
+        https://bugs.webkit.org/show_bug.cgi?id=207521
+        <rdar://problem/59331313>
+
+        Reviewed by Eric Carlson.
+
+        Covered by debug assertion not hit in layout tests.
+
+        * WebProcess/Network/webrtc/WebMDNSRegister.cpp:
+        (WebKit::WebMDNSRegister::finishedRegisteringMDNSName):
+        Call completion handler even if the document entry has been cleared, which can happen in suspend/destruction case.
+        If the entry is not there, all MDNS names for the document have been unregistered. We then report a registration error.
+
 2020-02-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/Network/webrtc/WebMDNSRegister.cpp

@@ -45 +45 @@
     if (result.has_value()) {
         auto iterator = m_registeringDocuments.find(pendingRegistration.documentIdentifier);
-        if (iterator == m_registeringDocuments.end())
+        if (iterator == m_registeringDocuments.end()) {
+            pendingRegistration.callback(makeUnexpected(WebCore::MDNSRegisterError::DNSSD));
             return;
+        }
         iterator->value.add(pendingRegistration.ipAddress, result.value());
     }