Changeset 196061 in webkit

Timestamp:

Feb 3, 2016 2:37:12 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Layout Test http/tests/appcache/different-https-origin-resource-main.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=145253

Reviewed by Michael Catanzaro.

Source/WebCore:

The problem is that when the load is cancelled while the
connection is still being established,
SoupMessage::notify::tls-errors is emitted and the handler calls
ResourceHandleClient::didFail() which can delete the ResourceHandle.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::tlsErrorsChangedCallback): Protect the ResourceHandle
for the scope of the callback because
ResourceHandleClient::didFail() could delete the object.

LayoutTests:

Update test expectation.

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Layout Test http/tests/appcache/different-https-origin-resource-main.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=145253
+
+        Reviewed by Michael Catanzaro.
+
+        Update test expectation.
+
+        * platform/gtk/TestExpectations:
+
 2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1749 +1749 @@
 webkit.org/b/123431 http/tests/local/link-stylesheet-load-order.html [ Failure Pass ]
 
-webkit.org/b/145253 http/tests/appcache/different-https-origin-resource-main.html  [ Failure Crash ]
+webkit.org/b/145253 http/tests/appcache/different-https-origin-resource-main.html  [ Failure ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Layout Test http/tests/appcache/different-https-origin-resource-main.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=145253
+
+        Reviewed by Michael Catanzaro.
+
+        The problem is that when the load is cancelled while the
+        connection is still being established,
+        SoupMessage::notify::tls-errors is emitted and the handler calls
+        ResourceHandleClient::didFail() which can delete the ResourceHandle.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::tlsErrorsChangedCallback): Protect the ResourceHandle
+        for the scope of the callback because
+        ResourceHandleClient::didFail() could delete the object.
+
 2016-02-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -339 +339 @@
 static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data)
 {
-    ResourceHandle* handle = static_cast<ResourceHandle*>(data);
+    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
     if (!handle || handle->cancelledOrClientless())
         return;
 
-    if (handleUnignoredTLSErrors(handle, message))
+    if (handleUnignoredTLSErrors(handle.get(), message))
         handle->cancel();
 }