Changeset 233032 in webkit

Timestamp:

Jun 21, 2018 2:54:30 AM (6 years ago)

Author:

Fujii Hironori

Message:

[GTK] http/tests/misc/bubble-drag-events.html crashes
​https://bugs.webkit.org/show_bug.cgi?id=182352

Reviewed by Carlos Garcia Campos.

Source/WebKit:

PingLoad::didFinish was called twice if it is used with
NetworkDataTaskSoup. PingLoad is not a ref-counted object. It is
destructed when PingLoad::didFinish is called.

PingLoad::didReceiveChallenge calls the ChallengeCompletionHandler
with AuthenticationChallengeDisposition::Cancel to cancel the
challenge and calls PingLoad::didFinish.

NetworkDataTaskSoup::continueAuthenticate calls
didReceiveChallenge with a ChallengeCompletionHandler which calls
didCompleteWithError. PingLoad::didCompleteWithError calls
PingLoad::didFinish.

didCompleteWithError callback should not be called in the
ChallengeCompletionHandler.

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::continueAuthenticate): Do not call
didFail() in the ChallengeCompletionHandler. Call
invalidateAndCancel() instead.

LayoutTests:

• platform/gtk/TestExpectations:

Marked http/tests/misc/bubble-drag-events.html as [ Failure ] not
[ Failure Timeout Crash ].
Unmarked http/tests/misc/cached-scripts.html.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-06-21  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK] http/tests/misc/bubble-drag-events.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=182352
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/gtk/TestExpectations:
+        Marked http/tests/misc/bubble-drag-events.html as [ Failure ] not
+        [ Failure Timeout Crash ].
+        Unmarked http/tests/misc/cached-scripts.html.
+
 2018-06-21  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1297 +1297 @@
 webkit.org/b/186767 fast/hidpi/broken-image-icon-very-hidpi.html [ Crash Pass ]
 
-# This one crashes only on EWS.
-webkit.org/b/186778 http/tests/misc/cached-scripts.html [ Crash Pass ]
-
 webkit.org/b/186779 http/tests/security/sandboxed-iframe-DENIED-modals.html [ Crash Pass ]
 
@@ -2663 +2660 @@
 Bug(GTK) http/tests/security/drag-over-remote-content-iframe.html [ Failure ]
 Bug(GTK) fast/events/drag-in-frames.html [ Failure Timeout ]
-webkit.org/b/182352 http/tests/misc/bubble-drag-events.html [ Failure Timeout Crash ]
+webkit.org/b/182352 http/tests/misc/bubble-drag-events.html [ Failure ]
 
 # Dragging images and links results in a DataTransfer object containing a non-empty files array

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-06-21  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK] http/tests/misc/bubble-drag-events.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=182352
+
+        Reviewed by Carlos Garcia Campos.
+
+        PingLoad::didFinish was called twice if it is used with
+        NetworkDataTaskSoup. PingLoad is not a ref-counted object. It is
+        destructed when PingLoad::didFinish is called.
+
+        PingLoad::didReceiveChallenge calls the ChallengeCompletionHandler
+        with AuthenticationChallengeDisposition::Cancel to cancel the
+        challenge and calls PingLoad::didFinish.
+
+        NetworkDataTaskSoup::continueAuthenticate calls
+        didReceiveChallenge with a ChallengeCompletionHandler which calls
+        didCompleteWithError. PingLoad::didCompleteWithError calls
+        PingLoad::didFinish.
+
+        didCompleteWithError callback should not be called in the
+        ChallengeCompletionHandler.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::continueAuthenticate): Do not call
+        didFail() in the ChallengeCompletionHandler. Call
+        invalidateAndCancel() instead.
+
 2018-06-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -529 +529 @@
 
         if (disposition == AuthenticationChallengeDisposition::Cancel) {
-            cancel();
-            didFail(cancelledError(m_soupRequest.get()));
+            invalidateAndCancel();
             return;
         }