Bug 1445614: Only warn when SetAlternateDesktop fails. r=jimm

This commit is contained in:
Bob Owen 2018-03-14 18:39:36 +00:00
Родитель 4986917db0
Коммит f2f76a9b94
1 изменённых файлов: 12 добавлений и 6 удалений

Просмотреть файл

@ -451,8 +451,10 @@ SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
if (aSandboxLevel > 4) { if (aSandboxLevel > 4) {
result = mPolicy->SetAlternateDesktop(false); result = mPolicy->SetAlternateDesktop(false);
MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result, if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {
"Failed to create alternate desktop for sandbox."); LOG_W("SetAlternateDesktop failed, result: %i, last error: %x",
result, ::GetLastError());
}
} }
if (aSandboxLevel > 3) { if (aSandboxLevel > 3) {
@ -849,8 +851,10 @@ SandboxBroker::SetSecurityLevelForPDFiumProcess()
"SetTokenLevel should never fail with these arguments, what happened?"); "SetTokenLevel should never fail with these arguments, what happened?");
result = mPolicy->SetAlternateDesktop(true); result = mPolicy->SetAlternateDesktop(true);
SANDBOX_ENSURE_SUCCESS(result, if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {
"Failed to create alternate desktop for sandbox."); LOG_W("SetAlternateDesktop failed, result: %i, last error: %x",
result, ::GetLastError());
}
result = mPolicy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW); result = mPolicy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
MOZ_ASSERT(sandbox::SBOX_ALL_OK == result, MOZ_ASSERT(sandbox::SBOX_ALL_OK == result,
@ -928,8 +932,10 @@ SandboxBroker::SetSecurityLevelForGMPlugin(SandboxLevel aLevel)
"SetTokenLevel should never fail with these arguments, what happened?"); "SetTokenLevel should never fail with these arguments, what happened?");
result = mPolicy->SetAlternateDesktop(true); result = mPolicy->SetAlternateDesktop(true);
SANDBOX_ENSURE_SUCCESS(result, if (NS_WARN_IF(result != sandbox::SBOX_ALL_OK)) {
"Failed to create alternate desktop for sandbox."); LOG_W("SetAlternateDesktop failed, result: %i, last error: %x",
result, ::GetLastError());
}
result = mPolicy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW); result = mPolicy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
MOZ_ASSERT(sandbox::SBOX_ALL_OK == result, MOZ_ASSERT(sandbox::SBOX_ALL_OK == result,