diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 15:36:08 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 15:36:08 +0000 |
| commit | 120be5d1b6455f4a97eaf560d12f0f78c8b1a107 (patch) | |
| tree | ee6b8b128d227780501617474e76b73601d01bfe /chrome/app/chrome_dll_main.cc | |
| parent | 780ae94178769a226f9e73f3776412edea60f850 (diff) | |
| download | chromium_src-120be5d1b6455f4a97eaf560d12f0f78c8b1a107.zip chromium_src-120be5d1b6455f4a97eaf560d12f0f78c8b1a107.tar.gz chromium_src-120be5d1b6455f4a97eaf560d12f0f78c8b1a107.tar.bz2 | |
Add regex escaping code to Mac sandbox implementation and re-enable the utility process on OS X.
Other changes:
* An error initializing the sandbox on OS X is now treated as fatal.
* Improved error reporting for sandbox-related failures.
BUG=26492,23837
TEST=Installing extensions and themes should still work on OS X.
Review URL: http://codereview.chromium.org/434077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 2217c8e..07ccf6d 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -554,8 +554,13 @@ int ChromeMain(int argc, char** argv) { // On OS X the renderer sandbox needs to be initialized later in the startup // sequence in RendererMainPlatformDelegate::PlatformInitialize(). if (process_type != switches::kRendererProcess && - process_type != switches::kExtensionProcess) - sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); + process_type != switches::kExtensionProcess) { + bool sandbox_initialized_ok = + sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); + // Die if the sandbox can't be enabled. + CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " + << process_type; + } #endif // OS_MACOSX startup_timer.Stop(); // End of Startup Time Measurement. |