Attachment 343738 Details for Bug 187110 – Patch

[patch] Patch

bug-187110-20180627123620.patch (text/plain), 2.75 KB, created by Jiewen Tan on 2018-06-27 12:36:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jiewen Tan

Created: 2018-06-27 12:36:20 PDT

Size: 2.75 KB

patch

obsolete

>Subversion Revision: 233096
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 7d7cdce1dcd3ab75a0e2b0e227056d077c531b51..b8773a252ebb22471da939ce678708efcbe2ce5a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-06-27  Jiewen Tan  <jiewen_tan@apple.com>
>+
>+        Add null check for xpc_connection_t in AuthenticationManager::initializeConnection and AuthenticationChallengeProxy::sendClientCertificateCredentialOverXpc
>+        https://bugs.webkit.org/show_bug.cgi?id=187110
>+        <rdar://problem/41536815>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm:
>+        (WebKit::AuthenticationManager::initializeConnection):
>+        * UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm:
>+        (WebKit::AuthenticationChallengeProxy::sendClientCertificateCredentialOverXpc const):
>+
> 2018-06-22  Brian Burg  <bburg@apple.com>
> 
>         [Cocoa] REGRESSION(W3C): actions for key equivalents are not respected
>diff --git a/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm b/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>index b86ae8afa2d54148a9e3ba2b499de844db19b428..6aae2053e6ba9a170d38bf11de93059aff94ec4b 100644
>--- a/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>+++ b/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
>@@ -40,7 +40,7 @@ void AuthenticationManager::initializeConnection(IPC::Connection* connection)
> {
>     ASSERT(isMainThread());
> 
>-    if (!connection || xpc_get_type(connection->xpcConnection()) != XPC_TYPE_CONNECTION) {
>+    if (!connection || !connection->xpcConnection()) {
>         ASSERT_NOT_REACHED();
>         return;
>     }
>diff --git a/Source/WebKit/UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm b/Source/WebKit/UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
>index 23e52604d56e79f43a8a82daea60eaed586a8afb..83d1fb92d98baee6ca9e74510e421b048d3c58e3 100644
>--- a/Source/WebKit/UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
>+++ b/Source/WebKit/UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
>@@ -53,6 +53,10 @@ void AuthenticationChallengeProxy::sendClientCertificateCredentialOverXpc(uint64
>     xpc_dictionary_set_value(message.get(), clientCertificateAuthenticationXPCCertificatesKey, certificateDataArray.get());
>     xpc_dictionary_set_uint64(message.get(), clientCertificateAuthenticationXPCPersistenceKey, static_cast<uint64_t>(credential.nsCredential().persistence));
> 
>+    if (!m_connection->xpcConnection()) {
>+        ASSERT_NOT_REACHED();
>+        return;
>+    }
>     xpc_connection_send_message(m_connection->xpcConnection(), message.get());
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187110: 343738 | 343775 | 343825 | 343826