Title: [232937] trunk/Source
Revision
232937
Author
jiewen_...@apple.com
Date
2018-06-18 11:54:49 -0700 (Mon, 18 Jun 2018)

Log Message

Add a graceful exit for AuthenticationManager::initializeConnection
https://bugs.webkit.org/show_bug.cgi?id=186632
<rdar://problem/41041033>

Reviewed by Brent Fulgham.

Source/WebKit:

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):

Source/WTF:

* wtf/spi/darwin/XPCSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (232936 => 232937)


--- trunk/Source/WTF/ChangeLog	2018-06-18 18:49:01 UTC (rev 232936)
+++ trunk/Source/WTF/ChangeLog	2018-06-18 18:54:49 UTC (rev 232937)
@@ -1,3 +1,13 @@
+2018-06-18  Jiewen Tan  <jiewen_...@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-18  Carlos Alberto Lopez Perez  <clo...@igalia.com>
 
         [WTF] Remove workarounds needed to support libstdc++-4

Modified: trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h (232936 => 232937)


--- trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2018-06-18 18:49:01 UTC (rev 232936)
+++ trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2018-06-18 18:54:49 UTC (rev 232937)
@@ -72,6 +72,7 @@
 #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)

Modified: trunk/Source/WebKit/ChangeLog (232936 => 232937)


--- trunk/Source/WebKit/ChangeLog	2018-06-18 18:49:01 UTC (rev 232936)
+++ trunk/Source/WebKit/ChangeLog	2018-06-18 18:54:49 UTC (rev 232937)
@@ -1,3 +1,17 @@
+2018-06-18  Jiewen Tan  <jiewen_...@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-18  Youenn Fablet  <you...@apple.com>
 
         Validate Cross-Origin-Resource-Policy for resources cached in the MemoryCache

Modified: trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm (232936 => 232937)


--- trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm	2018-06-18 18:49:01 UTC (rev 232936)
+++ trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm	2018-06-18 18:54:49 UTC (rev 232937)
@@ -40,6 +40,11 @@
 {
     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.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to