Title: [184113] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184113
- Author
- [email protected]
- Date
- 2015-05-11 11:59:53 -0700 (Mon, 11 May 2015)
Log Message
Merged r184004. rdar://problem/20593291
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184112 => 184113)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-11 18:41:51 UTC (rev 184112)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-11 18:59:53 UTC (rev 184113)
@@ -1,3 +1,20 @@
+2015-05-11 Babak Shafiei <[email protected]>
+
+ Merge r184004.
+
+ 2015-05-08 Anders Carlsson <[email protected]>
+
+ Fix ProcessLauncher port leak
+ https://bugs.webkit.org/show_bug.cgi?id=144807
+ rdar://problem/20593291
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::connectToService):
+ xpc_dictionary_set_mach_send increments the send right count so make sure to
+ balance it with a call to mach_port_deallocate.
+
2015-05-06 Joonghun Park <[email protected]>
[WK2] Simplify AsyncRequestImpl::ArgumentType parameters
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (184112 => 184113)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-05-11 18:41:51 UTC (rev 184112)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-05-11 18:59:53 UTC (rev 184113)
@@ -257,7 +257,10 @@
auto bootstrapMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
xpc_dictionary_set_string(bootstrapMessage.get(), "message-name", "bootstrap");
xpc_dictionary_set_string(bootstrapMessage.get(), "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] executablePath] fileSystemRepresentation]);
+
xpc_dictionary_set_mach_send(bootstrapMessage.get(), "server-port", listeningPort);
+ mach_port_deallocate(mach_task_self(), listeningPort);
+
xpc_dictionary_set_string(bootstrapMessage.get(), "client-identifier", clientIdentifier.data());
xpc_dictionary_set_string(bootstrapMessage.get(), "ui-process-name", [[[NSProcessInfo processInfo] processName] UTF8String]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
