From da173436ea2aa108b0707f54a24eb4df703a610b Mon Sep 17 00:00:00 2001 From: Bob Owen Date: Thu, 1 Mar 2018 14:37:26 +0000 Subject: [PATCH] Bug 1441801 Part 2: Fix line endings in sandboxBroker.cpp. r=jimm --- .../win/src/sandboxbroker/sandboxBroker.cpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp index 404a275db9578..5135f5f204379 100644 --- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp +++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp @@ -727,26 +727,26 @@ SandboxBroker::SetSecurityLevelForPluginProcess(int32_t aSandboxLevel) sandbox::MITIGATION_SEHOP | sandbox::MITIGATION_DEP_NO_ATL_THUNK | sandbox::MITIGATION_DEP | - sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY | - sandbox::MITIGATION_EXTENSION_POINT_DISABLE | - sandbox::MITIGATION_NONSYSTEM_FONT_DISABLE | - sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32; - + sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY | + sandbox::MITIGATION_EXTENSION_POINT_DISABLE | + sandbox::MITIGATION_NONSYSTEM_FONT_DISABLE | + sandbox::MITIGATION_IMAGE_LOAD_PREFER_SYS32; + if (!sRunningFromNetworkDrive) { mitigations |= sandbox::MITIGATION_IMAGE_LOAD_NO_REMOTE | sandbox::MITIGATION_IMAGE_LOAD_NO_LOW_LABEL; } - - result = mPolicy->SetProcessMitigations(mitigations); - SANDBOX_ENSURE_SUCCESS(result, - "Invalid flags for SetProcessMitigations."); - - sandbox::MitigationFlags delayedMitigations = - sandbox::MITIGATION_DLL_SEARCH_ORDER; - - result = mPolicy->SetDelayedProcessMitigations(delayedMitigations); - SANDBOX_ENSURE_SUCCESS(result, - "Invalid flags for SetDelayedProcessMitigations."); + + result = mPolicy->SetProcessMitigations(mitigations); + SANDBOX_ENSURE_SUCCESS(result, + "Invalid flags for SetProcessMitigations."); + + sandbox::MitigationFlags delayedMitigations = + sandbox::MITIGATION_DLL_SEARCH_ORDER; + + result = mPolicy->SetDelayedProcessMitigations(delayedMitigations); + SANDBOX_ENSURE_SUCCESS(result, + "Invalid flags for SetDelayedProcessMitigations."); if (aSandboxLevel >= 2) { // Level 2 and above uses low integrity, so we need to give write access to