File webkitgtk-bnc922895-cve-2015-2330-late-tls-cert... of Package webkitgtk

Overview Repositories Revisions Requests Users Attributes Meta

File webkitgtk-bnc922895-cve-2015-2330-late-tls-cert-verification.patch of Package webkitgtk

Index: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
===================================================================
--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -331,5 +331,5 @@
 }
 
-static void gotHeadersCallback(SoupMessage* message, gpointer data)
+static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data)
 {
     ResourceHandle* handle = static_cast<ResourceHandle*>(data);
@@ -337,8 +337,13 @@
         return;
 
-    if (handleUnignoredTLSErrors(handle, message)) {
+    if (handleUnignoredTLSErrors(handle, message))
         handle->cancel();
-        return;
-    }
+}
+
+static void gotHeadersCallback(SoupMessage* message, gpointer data)
+{
+    ResourceHandle* handle = static_cast<ResourceHandle*>(data);
+    if (!handle || handle->cancelledOrClientless())
+        return;
 
     ResourceHandleInternal* d = handle->getInternal();
@@ -935,4 +940,5 @@
         soup_message_headers_set_content_length(soupMessage->request_headers, 0);
 
+    g_signal_connect(d->m_soupMessage.get(), "notify::tls-errors", G_CALLBACK(tlsErrorsChangedCallback), handle);
     g_signal_connect(d->m_soupMessage.get(), "got-headers", G_CALLBACK(gotHeadersCallback), handle);
     g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);

Places

File webkitgtk-bnc922895-cve-2015-2330-late-tls-cert-verification.patch of Package webkitgtk

Places