diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 18:26:36 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 18:26:36 +0000 |
| commit | a396b7b69af2d934760838cad25e6579d7d62d77 (patch) | |
| tree | e1e100ab967eb08228e3e36d2306307efb2f6608 /sandbox | |
| parent | 6b7eb841aa2f3ffc7d8067c3b210c1d236c73e12 (diff) | |
| download | chromium_src-a396b7b69af2d934760838cad25e6579d7d62d77.zip chromium_src-a396b7b69af2d934760838cad25e6579d7d62d77.tar.gz chromium_src-a396b7b69af2d934760838cad25e6579d7d62d77.tar.bz2 | |
Fix unreachable code in sandbox/. Found with MSVC warning 4702.
It looks like this would have made Chrome not use DEP on Vista or something?
BUG=346382
TEST=none
R=jschuh@chromium.org
Review URL: https://codereview.chromium.org/199593003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/win/src/process_mitigations.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sandbox/win/src/process_mitigations.cc b/sandbox/win/src/process_mitigations.cc index d113047..a96193e 100644 --- a/sandbox/win/src/process_mitigations.cc +++ b/sandbox/win/src/process_mitigations.cc @@ -260,6 +260,7 @@ MitigationFlags FilterPostStartupProcessMitigations(MitigationFlags flags) { if (version < base::win::VERSION_VISTA) { return flags & (MITIGATION_DEP | MITIGATION_DEP_NO_ATL_THUNK); + } // Windows Vista if (version < base::win::VERSION_WIN7) { @@ -270,8 +271,8 @@ MitigationFlags FilterPostStartupProcessMitigations(MitigationFlags flags) { MITIGATION_HEAP_TERMINATE); } - // Windows 7 and Vista. - } else if (version < base::win::VERSION_WIN8) { + // Windows 7. + if (version < base::win::VERSION_WIN8) { return flags & (MITIGATION_BOTTOM_UP_ASLR | MITIGATION_DLL_SEARCH_ORDER | MITIGATION_HEAP_TERMINATE); |