summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sandbox_policy.cc
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:53:34 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 19:53:34 +0000
commit2d003f2735ce0bf299fca38759e57f99b2e0eabf (patch)
treece00cd502a253e0743fbb8bdd6720d2187324ef5 /chrome/browser/sandbox_policy.cc
parentd5c7dc99efbbd0934aaae33c7e67ac4cf3403fd0 (diff)
downloadchromium_src-2d003f2735ce0bf299fca38759e57f99b2e0eabf.zip
chromium_src-2d003f2735ce0bf299fca38759e57f99b2e0eabf.tar.gz
chromium_src-2d003f2735ce0bf299fca38759e57f99b2e0eabf.tar.bz2
Hacky fix for crashes with Google Desktop installed.
The fix is to add --ignored=" --type=renderer " to the command line of non-renderer, non-plugin subprocesses, tricking GD into not injecting its DLL. BUG=25580 Review URL: http://codereview.chromium.org/400026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sandbox_policy.cc')
-rw-r--r--chrome/browser/sandbox_policy.cc7
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()) {