Title: [140764] trunk/Source/WebKit2
- Revision
- 140764
- Author
- [email protected]
- Date
- 2013-01-24 19:02:54 -0800 (Thu, 24 Jan 2013)
Log Message
Fix NetworkProcess loading after r140730.
Reviewed by Sam Weinig.
If a process' sandbox profile path is empty, don't try to initialize the sandbox.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::initializeSandbox):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (140763 => 140764)
--- trunk/Source/WebKit2/ChangeLog 2013-01-25 02:40:20 UTC (rev 140763)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-25 03:02:54 UTC (rev 140764)
@@ -1,3 +1,14 @@
+2013-01-24 Tim Horton <[email protected]>
+
+ Fix NetworkProcess loading after r140730.
+
+ Reviewed by Sam Weinig.
+
+ If a process' sandbox profile path is empty, don't try to initialize the sandbox.
+
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::initializeSandbox):
+
2013-01-24 Ryosuke Niwa <[email protected]>
Mac build fix after r140752.
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (140763 => 140764)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-01-25 02:40:20 UTC (rev 140763)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2013-01-25 03:02:54 UTC (rev 140764)
@@ -118,13 +118,15 @@
case SandboxInitializationParameters::UseDefaultSandboxProfilePath:
case SandboxInitializationParameters::UseOverrideSandboxProfilePath: {
String sandboxProfilePath = sandboxParameters.mode() == SandboxInitializationParameters::UseDefaultSandboxProfilePath ? defaultProfilePath : sandboxParameters.overrideSandboxProfilePath();
- CString profilePath = fileSystemRepresentation(sandboxProfilePath);
- char* errorBuf;
- if (sandbox_init_with_parameters(profilePath.data(), SANDBOX_NAMED_EXTERNAL, sandboxParameters.namedParameterArray(), &errorBuf)) {
- WTFLogAlways("%s: Couldn't initialize sandbox profile [%s], error '%s'\n", getprogname(), profilePath.data(), errorBuf);
- for (size_t i = 0, count = sandboxParameters.count(); i != count; ++i)
- WTFLogAlways("%s=%s\n", sandboxParameters.name(i), sandboxParameters.value(i));
- exit(EX_NOPERM);
+ if (!sandboxProfilePath.isEmpty()) {
+ CString profilePath = fileSystemRepresentation(sandboxProfilePath);
+ char* errorBuf;
+ if (sandbox_init_with_parameters(profilePath.data(), SANDBOX_NAMED_EXTERNAL, sandboxParameters.namedParameterArray(), &errorBuf)) {
+ WTFLogAlways("%s: Couldn't initialize sandbox profile [%s], error '%s'\n", getprogname(), profilePath.data(), errorBuf);
+ for (size_t i = 0, count = sandboxParameters.count(); i != count; ++i)
+ WTFLogAlways("%s=%s\n", sandboxParameters.name(i), sandboxParameters.value(i));
+ exit(EX_NOPERM);
+ }
}
break;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
