Changeset 283283 in webkit

Timestamp:

Sep 29, 2021, 4:56:07 PM (5 years ago)

Author:

Chris Dumez

Message:

[ iOS Debug ] http/tests/xmlhttprequest/access-control-preflight-credential-sync.html is a flaky crash
​https://bugs.webkit.org/show_bug.cgi?id=228305
<rdar://problem/81136891>

Reviewed by Alex Christensen.

Source/WebKit:

When a NetworkResourceLoader for a synchronous XHR gets aborted (e.g. because the connection to
the WebProcess was severed), NetworkResourceLoader::abort() would fail to call
sendReplyToSynchronousRequest() (sendReplyToSynchronousRequest was only called in didFailLoading() and
didFinishLoading()). As a result, we would hit the following assertion in the NetworkResourceLoader

destructor later on: ASSERT(!isSynchronous()

!m_synchronousLoadData->delayedReply)

No new tests, covered by existing test that I am unskipping.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::abort):

LayoutTests:

Unskip test that should no longer be flaky.

• platform/ios-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-29  Chris Dumez  <cdumez@apple.com>
+
+        [ iOS Debug ] http/tests/xmlhttprequest/access-control-preflight-credential-sync.html is a flaky crash
+        https://bugs.webkit.org/show_bug.cgi?id=228305
+        <rdar://problem/81136891>
+
+        Reviewed by Alex Christensen.
+
+        Unskip test that should no longer be flaky.
+
+        * platform/ios-wk2/TestExpectations:
+
 2021-09-29  Kiet Ho  <tho22@apple.com>
 

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1909 +1909 @@
 webkit.org/b/215350 http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html [ Pass Timeout ]
 
-webkit.org/b/228305 [ Debug ] http/tests/xmlhttprequest/access-control-preflight-credential-sync.html [ Pass Crash ]
-
 webkit.org/b/215351 http/wpt/service-workers/module-meta-url-fragment.https.html [ Pass Failure ]
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-29  Chris Dumez  <cdumez@apple.com>
+
+        [ iOS Debug ] http/tests/xmlhttprequest/access-control-preflight-credential-sync.html is a flaky crash
+        https://bugs.webkit.org/show_bug.cgi?id=228305
+        <rdar://problem/81136891>
+
+        Reviewed by Alex Christensen.
+
+        When a NetworkResourceLoader for a synchronous XHR gets aborted (e.g. because the connection to
+        the WebProcess was severed), NetworkResourceLoader::abort() would fail to call
+        sendReplyToSynchronousRequest() (sendReplyToSynchronousRequest was only called in didFailLoading() and
+        didFinishLoading()). As a result, we would hit the following assertion in the NetworkResourceLoader
+        destructor later on: ASSERT(!isSynchronous() || !m_synchronousLoadData->delayedReply)
+
+        No new tests, covered by existing test that I am unskipping.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::abort):
+
 2021-09-29  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -524 +524 @@
     }
 
+    if (isSynchronous()) {
+        m_synchronousLoadData->error = ResourceError { ResourceError::Type::Cancellation };
+        sendReplyToSynchronousRequest(*m_synchronousLoadData, nullptr, { });
+    }
+
     cleanup(LoadResult::Cancel);
 }