diff options
| author | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 05:16:59 +0000 |
|---|---|---|
| committer | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 05:16:59 +0000 |
| commit | 5be06e403789b537097560fef594000626a61997 (patch) | |
| tree | 7921ffcc481aa118a901086229fda96519973757 /chrome_frame/test_utils.cc | |
| parent | 96798670fd3a04b7bf820eb39c7fdbde25414e53 (diff) | |
| download | chromium_src-5be06e403789b537097560fef594000626a61997.zip chromium_src-5be06e403789b537097560fef594000626a61997.tar.gz chromium_src-5be06e403789b537097560fef594000626a61997.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/test_utils.cc')
| -rw-r--r-- | chrome_frame/test_utils.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index ef78046..b8884e7 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -88,7 +88,7 @@ void ScopedChromeFrameRegistrar::DoRegistration( int entrypoint_index = 0; base::LaunchOptions launch_options; - base::ProcessHandle process_handle = INVALID_HANDLE_VALUE; + base::win::ScopedHandle process_handle; int exit_code = -1; if (registration_type == PER_USER) @@ -111,13 +111,12 @@ void ScopedChromeFrameRegistrar::DoRegistration( << "Failed to register or unregister DLL with command: " << registration_command; } else { - base::win::ScopedHandle rundll32(process_handle); if (!base::WaitForExitCodeWithTimeout( - process_handle, &exit_code, + process_handle.Get(), &exit_code, base::TimeDelta::FromMilliseconds(kDllRegistrationTimeoutMs))) { LOG(ERROR) << "Timeout waiting to register or unregister DLL with " "command: " << registration_command; - base::KillProcess(process_handle, 0, false); + base::KillProcess(process_handle.Get(), 0, false); NOTREACHED() << "Aborting test due to registration failure."; } } |