Title: [218911] trunk/Source/WebKit2
- Revision
- 218911
- Author
- rn...@webkit.org
- Date
- 2017-06-28 19:56:22 -0700 (Wed, 28 Jun 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218910 => 218911)
--- trunk/Source/WebKit2/ChangeLog 2017-06-29 02:54:00 UTC (rev 218910)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-29 02:56:22 UTC (rev 218911)
@@ -1,3 +1,15 @@
+2017-06-28 Ryosuke Niwa <rn...@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 <you...@apple.com>
Support PeerConnectionStates::BundlePolicy::MaxBundle when setting rtc configuration
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (218910 => 218911)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-06-29 02:54:00 UTC (rev 218910)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2017-06-29 02:56:22 UTC (rev 218911)
@@ -201,7 +201,8 @@
// And the receive right.
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;
processLauncher->didFinishLaunchingProcess(0, IPC::Connection::Identifier());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
