Attachment 342953 Details for Bug 186632 – Patch for landing

[patch] Patch for landing

bug-186632-20180618111024.patch (text/plain), 3.13 KB, created by Jiewen Tan on 2018-06-18 11:10:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jiewen Tan

Created: 2018-06-18 11:10:24 PDT

Size: 3.13 KB

patch

obsolete

>Subversion Revision: 232847
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 4f1c316a790e00ba184d9ef660215fd6494d4e04..dcba60423ad1d3ca306fc5f780d64b2aa4a0d430 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-14  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        Add a graceful exit for AuthenticationManager::initializeConnection
>+        https://bugs.webkit.org/show_bug.cgi?id=186632
>+        <rdar://problem/41041033>
>+
>+        Reviewed by Brent Fulgham.
>+
>+        * wtf/spi/darwin/XPCSPI.h:
>+
> 2018-06-13  Keith Miller  <keith_miller@apple.com>
> 
>         AutomaticThread should have a way to provide a thread name
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ed44a723ee625011cdd69ce07b77208b4ffce201..1529a3e1213164efba0a610962c60724fd3b19db 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-06-14  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        Add a graceful exit for AuthenticationManager::initializeConnection
>+        https://bugs.webkit.org/show_bug.cgi?id=186632
>+        <rdar://problem/41041033>
>+
>+        Reviewed by Brent Fulgham.
>+
>+        Add a graceful exit for AuthenticationManager::initializeConnection when the provided IPC connection
>+        is null or the underlying xpc connection is null.
>+
>+        * Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm:
>+        (WebKit::AuthenticationManager::initializeConnection):
>+
> 2018-06-14  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK][WPE] WebDriver: handle acceptInsecureCertificates capability
>diff --git a/Source/WTF/wtf/spi/darwin/XPCSPI.h b/Source/WTF/wtf/spi/darwin/XPCSPI.h
>index 8c6ee3c7d049fe285fb81a406e993641aacd9914..1a33e2e77430c6100f6110871a0e0b42b058295c 100644
>--- a/Source/WTF/wtf/spi/darwin/XPCSPI.h
>+++ b/Source/WTF/wtf/spi/darwin/XPCSPI.h
>@@ -72,6 +72,7 @@ typedef void (*xpc_connection_handler_t)(xpc_connection_t connection);
> #define XPC_ERROR_TERMINATION_IMMINENT XPC_GLOBAL_OBJECT(_xpc_error_termination_imminent)
> #define XPC_TYPE_ARRAY (&_xpc_type_array)
> #define XPC_TYPE_BOOL (&_xpc_type_bool)
>+#define XPC_TYPE_CONNECTION (&_xpc_type_connection)
> #define XPC_TYPE_DICTIONARY (&_xpc_type_dictionary)
> #define XPC_TYPE_ERROR (&_xpc_type_error)
> #define XPC_TYPE_STRING (&_xpc_type_string)
>diff --git a/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm b/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>index 080c61e406aa60a8a97b396c955f349e356954fa..b86ae8afa2d54148a9e3ba2b499de844db19b428 100644
>--- a/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>+++ b/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>@@ -40,6 +40,11 @@ void AuthenticationManager::initializeConnection(IPC::Connection* connection)
> {
>     ASSERT(isMainThread());
> 
>+    if (!connection || xpc_get_type(connection->xpcConnection()) != XPC_TYPE_CONNECTION) {
>+        ASSERT_NOT_REACHED();
>+        return;
>+    }
>+
>     auto weakThis = makeWeakPtr(*this);
>     // The following xpc event handler overwrites the boostrap event handler and is only used
>     // to capture client certificate credential.

Actions: View | Formatted Diff | Diff

Attachments on bug 186632: 342761 | 342786 | 342953