Title: [196911] releases/WebKitGTK/webkit-2.10
Revision
196911
Author
[email protected]
Date
2016-02-22 01:09:52 -0800 (Mon, 22 Feb 2016)

Log Message

Merge r196061 - [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:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (196910 => 196911)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2016-02-22 09:07:56 UTC (rev 196910)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2016-02-22 09:09:52 UTC (rev 196911)
@@ -1,3 +1,14 @@
+2016-02-03  Carlos Garcia Campos  <[email protected]>
+
+        [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-02  Fujii Hironori  <[email protected]>
 
         ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result)

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (196910 => 196911)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-02-22 09:07:56 UTC (rev 196910)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-02-22 09:09:52 UTC (rev 196911)
@@ -1,3 +1,20 @@
+2016-02-03  Carlos Garcia Campos  <[email protected]>
+
+        [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  Zan Dobersek  <[email protected]>
 
         [TexMap] Don't use RELEASE_ASSERT in TextureMapperLayer::computeTransformsRecursive()

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (196910 => 196911)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2016-02-22 09:07:56 UTC (rev 196910)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp	2016-02-22 09:09:52 UTC (rev 196911)
@@ -338,11 +338,11 @@
 
 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();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to