Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

content/common/sandbox_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/sandbox_win.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 449 matching lines @@
   // We're not worried about broker handles or not crossing process boundaries.
   if (source_process_handle == target_process_handle ||
       target_process_handle == ::GetCurrentProcess())
     return TRUE;
 
   // Only sandboxed children are placed in jobs, so just check them.
   BOOL is_in_job = FALSE;
   if (!::IsProcessInJob(target_process_handle, NULL, &is_in_job)) {
     // We need a handle with permission to check the job object.
     if (ERROR_ACCESS_DENIED == ::GetLastError()) {
-      HANDLE temp_handle;
+      base::win::ScopedHandle process;
       CHECK(g_iat_orig_duplicate_handle(::GetCurrentProcess(),
                                         target_process_handle,
                                         ::GetCurrentProcess(),
-                                        &temp_handle,
+                                        process.Receive(),
                                         PROCESS_QUERY_INFORMATION,
                                         FALSE, 0));
-      base::win::ScopedHandle process(temp_handle);
       CHECK(::IsProcessInJob(process, NULL, &is_in_job));
     }
   }
 
   if (is_in_job) {
     // We never allow inheritable child handles.
     CHECK(!inherit_handle) << kDuplicateHandleWarning;
 
     // Duplicate the handle again, to get the final permissions.
-    HANDLE temp_handle;
+    base::win::ScopedHandle handle;
     CHECK(g_iat_orig_duplicate_handle(target_process_handle, *target_handle,
-                                      ::GetCurrentProcess(), &temp_handle,
+                                      ::GetCurrentProcess(), handle.Receive(),
                                       0, FALSE, DUPLICATE_SAME_ACCESS));
-    base::win::ScopedHandle handle(temp_handle);
 
     // Callers use CHECK macro to make sure we get the right stack.
     CheckDuplicateHandle(handle);
   }
 
   return TRUE;
 }
 #endif
 
 }  // namespace
@@ skipping 93 matching lines @@
   // to create separate pretetch settings for browser, renderer etc.
   cmd_line->AppendArg(base::StringPrintf("/prefetch:%d", base::Hash(type_str)));
 
   if (!in_sandbox) {
     base::ProcessHandle process = 0;
     base::LaunchProcess(*cmd_line, base::LaunchOptions(), &process);
     g_broker_services->AddTargetPeer(process);
     return process;
   }
 
+  base::win::ScopedProcessInformation target;
   sandbox::TargetPolicy* policy = g_broker_services->CreatePolicy();
 
   sandbox::MitigationFlags mitigations = sandbox::MITIGATION_HEAP_TERMINATE |
                                          sandbox::MITIGATION_BOTTOM_UP_ASLR |
                                          sandbox::MITIGATION_DEP |
                                          sandbox::MITIGATION_DEP_NO_ATL_THUNK |
                                          sandbox::MITIGATION_SEHOP;
 
   if (policy->SetProcessMitigations(mitigations) != sandbox::SBOX_ALL_OK)
     return 0;
@@ skipping 51 matching lines @@
 
   if (delegate) {
     bool success = true;
     delegate->PreSpawnTarget(policy, &success);
     if (!success)
       return 0;
   }
 
   TRACE_EVENT_BEGIN_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
-  PROCESS_INFORMATION temp_process_info = {};
   result = g_broker_services->SpawnTarget(
-               cmd_line->GetProgram().value().c_str(),
-               cmd_line->GetCommandLineString().c_str(),
-               policy, &temp_process_info);
+      cmd_line->GetProgram().value().c_str(),
+      cmd_line->GetCommandLineString().c_str(),
+      policy, target.Receive());
   policy->Release();
-  base::win::ScopedProcessInformation target(temp_process_info);
 
   TRACE_EVENT_END_ETW("StartProcessWithAccess::LAUNCHPROCESS", 0, 0);
 
   if (sandbox::SBOX_ALL_OK != result) {
     if (result == sandbox::SBOX_ERROR_GENERIC)
       DPLOG(ERROR) << "Failed to launch process";
     else
       DLOG(ERROR) << "Failed to launch process. Error: " << result;
     return 0;
   }
@@ skipping 43 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content