From 5be06e403789b537097560fef594000626a61997 Mon Sep 17 00:00:00 2001 From: "rvargas@chromium.org" Date: Thu, 28 Nov 2013 05:16:59 +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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237459 Review URL: https://codereview.chromium.org/71013004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237675 0039d316-1c4b-4281-b951-d872f2087c98 --- win8/delegate_execute/chrome_util.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'win8/delegate_execute/chrome_util.cc') diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index dec23f7..3695b33 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -103,7 +103,7 @@ void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) { if (IsBrowserRunning(chrome_exe) || !NewChromeExeExists(chrome_exe)) return; - base::ProcessHandle process_handle = base::kNullProcessHandle; + base::win::ScopedHandle process_handle; if (InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) { // Read the update command from the registry. @@ -119,7 +119,6 @@ void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) { &process_handle)) { AtlTrace("%hs. Failed to launch command to finalize update; " "error %u.\n", __FUNCTION__, ::GetLastError()); - process_handle = base::kNullProcessHandle; } } } else { @@ -140,16 +139,16 @@ void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) { AtlTrace("%hs. Failed to launch command to finalize update; " "hr=0x%X.\n", __FUNCTION__, hr); } else { - process_handle = reinterpret_cast(handle); + process_handle.Set(reinterpret_cast(handle)); } } } // Wait for the update to complete and report the results. - if (process_handle != base::kNullProcessHandle) { + if (process_handle.IsValid()) { int exit_code = 0; // WaitForExitCode will close the handle in all cases. - if (!base::WaitForExitCode(process_handle, &exit_code)) { + if (!base::WaitForExitCode(process_handle.Take(), &exit_code)) { AtlTrace("%hs. Failed to get result when finalizing update.\n", __FUNCTION__); } else if (exit_code != installer::RENAME_SUCCESSFUL) { -- cgit v1.1