diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 21:11:54 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 21:11:54 +0000 |
| commit | 9d15b9424a6fe2db1146a8bacbc19a08be1ba865 (patch) | |
| tree | 95fad91776b26f5c6a6bfff363ba95241b0af498 | |
| parent | 0f0995046ee54ab6690a63585cab4e84101d6e02 (diff) | |
| download | chromium_src-9d15b9424a6fe2db1146a8bacbc19a08be1ba865.zip chromium_src-9d15b9424a6fe2db1146a8bacbc19a08be1ba865.tar.gz chromium_src-9d15b9424a6fe2db1146a8bacbc19a08be1ba865.tar.bz2 | |
Merge 32382 - Hacky fix for crashes with Google Desktop installed.
The fix is to add ignored=" type=renderer " to the command line of
nonrenderer, nonplugin subprocesses, tricking GD into not injecting its DLL.
BUG=25580
Review URL: http://codereview.chromium.org/400026
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/402063
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sandbox_policy.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc index 5d3dcfc..4af55a6 100644 --- a/chrome/browser/sandbox_policy.cc +++ b/chrome/browser/sandbox_policy.cc @@ -397,6 +397,13 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, return 0; } else { AddPolicyForRenderer(policy, &on_sandbox_desktop); + + if (type_str != switches::kRendererProcess) { + // Hack for Google Desktop crash. Trick GD into not injecting its DLL into + // this subprocess. See + // http://code.google.com/p/chromium/issues/detail?id=25580 + cmd_line->AppendSwitchWithValue("ignored", " --type=renderer "); + } } if (!exposed_dir.empty()) { |