diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 03:46:42 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 03:46:42 +0000 |
| commit | c5647b21b8187e5aacee5ce42b0fb38b4a48e50a (patch) | |
| tree | 50c8bfbc42ebef400b97eed20fa0084d85cc8c8a /sandbox | |
| parent | 14fca3437054cf0c9593e84248dea9b316e23e8e (diff) | |
| download | chromium_src-c5647b21b8187e5aacee5ce42b0fb38b4a48e50a.zip chromium_src-c5647b21b8187e5aacee5ce42b0fb38b4a48e50a.tar.gz chromium_src-c5647b21b8187e5aacee5ce42b0fb38b4a48e50a.tar.bz2 | |
Ignore DEP and SEHOP flags on Win64
These flags aren't supported on 64-bit and can throw an error on Win8 process creation.
BUG=147752
Review URL: https://chromiumcodereview.appspot.com/12207106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/win/src/process_mitigations.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sandbox/win/src/process_mitigations.cc b/sandbox/win/src/process_mitigations.cc index f569479..b914854 100644 --- a/sandbox/win/src/process_mitigations.cc +++ b/sandbox/win/src/process_mitigations.cc @@ -191,6 +191,8 @@ void ConvertProcessMitigationsToPolicy(MitigationFlags flags, if (version <= base::win::VERSION_VISTA) return; + // DEP and SEHOP are not valid for 64-bit Windows +#if !defined(_WIN64) if (flags & MITIGATION_DEP) { *policy_flags |= PROCESS_CREATION_MITIGATION_POLICY_DEP_ENABLE; if (!(flags & MITIGATION_DEP_NO_ATL_THUNK)) @@ -199,6 +201,7 @@ void ConvertProcessMitigationsToPolicy(MitigationFlags flags, if (flags & MITIGATION_SEHOP) *policy_flags |= PROCESS_CREATION_MITIGATION_POLICY_SEHOP_ENABLE; +#endif // Win 7 if (version < base::win::VERSION_WIN8) |