From 166a865e356b1841a1e3bf3b32bc5aaf13215f6e Mon Sep 17 00:00:00 2001 From: "rvargas@chromium.org" Date: Wed, 27 Nov 2013 01:03:43 +0000 Subject: Base: Remove Receive() from ScopedHandle. In general, the OS API contract doesn't guarantee that output variables are not modified on failure, so a Reeceive pattern is fundamentally insecure. BUG=318531 TEST=current tests tbr'ing owners for the consumers. TBR=jvoung@chromium.org, thakis@chromium.org, sergeyu@chromium.org, grt@chromium.org, gene@chromium.org, youngki@chromium.org Review URL: https://codereview.chromium.org/71013004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237459 0039d316-1c4b-4281-b951-d872f2087c98 --- cloud_print/service/win/chrome_launcher.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'cloud_print/service/win') diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index 51501df..35d760e 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -67,22 +67,23 @@ void CloseChrome(HANDLE process, DWORD thread_id) { } bool LaunchProcess(const CommandLine& cmdline, - base::ProcessHandle* process_handle, + base::win::ScopedHandle* process_handle, DWORD* thread_id) { STARTUPINFO startup_info = {}; startup_info.cb = sizeof(startup_info); startup_info.dwFlags = STARTF_USESHOWWINDOW; startup_info.wShowWindow = SW_SHOW; - base::win::ScopedProcessInformation process_info; + PROCESS_INFORMATION temp_process_info = {}; if (!CreateProcess(NULL, const_cast(cmdline.GetCommandLineString().c_str()), NULL, NULL, - FALSE, 0, NULL, NULL, &startup_info, process_info.Receive())) { + FALSE, 0, NULL, NULL, &startup_info, &temp_process_info)) { return false; } + base::win::ScopedProcessInformation process_info(temp_process_info); if (process_handle) - *process_handle = process_info.TakeProcessHandle(); + process_handle->Set(process_info.TakeProcessHandle()); if (thread_id) *thread_id = process_info.thread_id(); @@ -240,7 +241,7 @@ void ChromeLauncher::Run() { base::win::ScopedHandle chrome_handle; base::Time started = base::Time::Now(); DWORD thread_id = 0; - LaunchProcess(cmd, chrome_handle.Receive(), &thread_id); + LaunchProcess(cmd, &chrome_handle, &thread_id); HANDLE handles[] = {stop_event_.handle(), chrome_handle}; DWORD wait_result = WAIT_TIMEOUT; @@ -317,7 +318,7 @@ std::string ChromeLauncher::CreateServiceStateFile( base::win::ScopedHandle chrome_handle; DWORD thread_id = 0; - if (!LaunchProcess(cmd, chrome_handle.Receive(), &thread_id)) { + if (!LaunchProcess(cmd, &chrome_handle, &thread_id)) { LOG(ERROR) << "Unable to launch Chrome."; return result; } -- cgit v1.1