diff options
| author | jschuh <jschuh@chromium.org> | 2014-11-06 17:26:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 01:27:16 +0000 |
| commit | 2f5fb91566b8d2d9861c4b0437bcfb20cba3f1d9 (patch) | |
| tree | b3b53953a39875c7f77d10ad0e849399563665ee /sandbox/win | |
| parent | 6371af94b25f78f85691e892627a9e88832e2ba0 (diff) | |
| download | chromium_src-2f5fb91566b8d2d9861c4b0437bcfb20cba3f1d9.zip chromium_src-2f5fb91566b8d2d9861c4b0437bcfb20cba3f1d9.tar.gz chromium_src-2f5fb91566b8d2d9861c4b0437bcfb20cba3f1d9.tar.bz2 | |
Check alternate desktop before applying integrity label
No alternate desktop means there's nothing to label
BUG=422218
R=wfh@chromium.org
Review URL: https://codereview.chromium.org/686083007
Cr-Commit-Position: refs/heads/master@{#303151}
Diffstat (limited to 'sandbox/win')
| -rw-r--r-- | sandbox/win/src/sandbox_policy_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sandbox/win/src/sandbox_policy_base.cc b/sandbox/win/src/sandbox_policy_base.cc index ad60dfa..d3c920e 100644 --- a/sandbox/win/src/sandbox_policy_base.cc +++ b/sandbox/win/src/sandbox_policy_base.cc @@ -459,7 +459,7 @@ ResultCode PolicyBase::MakeTokens(HANDLE* initial, HANDLE* lockdown) { // integrity label on the object is no higher than the sandboxed process's // integrity level. So, we lower the label on the desktop process if it's // not already low enough for our process. - if (use_alternate_desktop_ && + if (alternate_desktop_handle_ && use_alternate_desktop_ && integrity_level_ != INTEGRITY_LEVEL_LAST && alternate_desktop_integrity_level_label_ < integrity_level_ && base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) { |