diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 22:14:36 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 22:14:36 +0000 |
| commit | 664f1d72147316757f9b5d32879814bd0c31b85c (patch) | |
| tree | 455d6380f49277eab31aef8db34ddecd1968ab10 /sandbox | |
| parent | 1b8281b776173009b4a90d43bdea872d35fb71f5 (diff) | |
| download | chromium_src-664f1d72147316757f9b5d32879814bd0c31b85c.zip chromium_src-664f1d72147316757f9b5d32879814bd0c31b85c.tar.gz chromium_src-664f1d72147316757f9b5d32879814bd0c31b85c.tar.bz2 | |
Don't explicitly set DEP flags on Vista
Mandatory DEP is set in the PE headers so trying to force enable it
manually fails without an error code that's not discernable from the
no DEP case (so we get a startup crash on Vista).
NOTRY=true
R=CPU
TBR=cpu
BUG=352932
Review URL: https://codereview.chromium.org/199523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/win/src/process_mitigations.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sandbox/win/src/process_mitigations.cc b/sandbox/win/src/process_mitigations.cc index a96193e..9ec19cd 100644 --- a/sandbox/win/src/process_mitigations.cc +++ b/sandbox/win/src/process_mitigations.cc @@ -264,9 +264,7 @@ MitigationFlags FilterPostStartupProcessMitigations(MitigationFlags flags) { // Windows Vista if (version < base::win::VERSION_WIN7) { - return flags & (MITIGATION_DEP | - MITIGATION_DEP_NO_ATL_THUNK | - MITIGATION_BOTTOM_UP_ASLR | + return flags & (MITIGATION_BOTTOM_UP_ASLR | MITIGATION_DLL_SEARCH_ORDER | MITIGATION_HEAP_TERMINATE); } |