Changeset 167638 in webkit

Timestamp:

Apr 21, 2014, 5:23:04 PM (11 years ago)

Author:

Simon Fraser

Message:

Don't try to use a null connection()->xpcConnection()
​https://bugs.webkit.org/show_bug.cgi?id=131961

Reviewed by Dan Bernstein.

If running with -WebKit2UseXPCServiceForWebProcess NO, connection()->xpcConnection()
is null and xpc_connection_get_pid() would crash, so null-check the xpcConnection.

• UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::didFinishLaunching):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2014-04-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't try to use a null connection()->xpcConnection()
+        https://bugs.webkit.org/show_bug.cgi?id=131961
+
+        Reviewed by Dan Bernstein.
+        
+        If running with -WebKit2UseXPCServiceForWebProcess NO, connection()->xpcConnection()
+        is null and xpc_connection_get_pid() would crash, so null-check the xpcConnection.
+
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::didFinishLaunching):
+
 2014-04-21  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp ¶

@@ -202 +202 @@
     
 #if PLATFORM(IOS) && USE(XPC_SERVICES)
-    m_assertion = std::make_unique<ProcessAssertion>(xpc_connection_get_pid(connection()->xpcConnection()), AssertionState::Foreground);
+    if (xpc_connection_t connection = this->connection()->xpcConnection())
+        m_assertion = std::make_unique<ProcessAssertion>(xpc_connection_get_pid(connection), AssertionState::Foreground);
 #endif
 }