Changeset 218911 in webkit

Timestamp:

Jun 28, 2017 7:56:22 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION (r218842): com.apple.WebKit crash in WebKit::ProcessLauncher::launchProcess
​https://bugs.webkit.org/show_bug.cgi?id=173950

Reviewed by Chris Dumez.

Added a null check as m_xpcConnection could be nullptr here in the case platformInvalidate had been called.

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r218842): com.apple.WebKit crash in WebKit::ProcessLauncher::launchProcess
+        https://bugs.webkit.org/show_bug.cgi?id=173950
+
+        Reviewed by Chris Dumez.
+
+        Added a null check as m_xpcConnection could be nullptr here in the case platformInvalidate had been called.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2017-06-28  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -202 +202 @@
         mach_port_mod_refs(mach_task_self(), listeningPort, MACH_PORT_RIGHT_RECEIVE, -1);
 
-        xpc_connection_cancel(processLauncher->m_xpcConnection.get());
+        if (processLauncher->m_xpcConnection)
+            xpc_connection_cancel(processLauncher->m_xpcConnection.get());
         processLauncher->m_xpcConnection = nullptr;