diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 21:33:41 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 21:33:41 +0000 |
| commit | 90637900afda69bccf5ef9200585e72e01c2f2d6 (patch) | |
| tree | 02c5de446b1bd4a605f3df395c77215e73cb97e7 /sandbox | |
| parent | f83a50edab33e78d592a7c679f045698e8432a32 (diff) | |
| download | chromium_src-90637900afda69bccf5ef9200585e72e01c2f2d6.zip chromium_src-90637900afda69bccf5ef9200585e72e01c2f2d6.tar.gz chromium_src-90637900afda69bccf5ef9200585e72e01c2f2d6.tar.bz2 | |
Sandbox: Two files were left behind when changing the use
of scoped handles (r144571), because they were not part of
the original (backed out) CL.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10703012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/src/broker_services.h | 2 | ||||
| -rw-r--r-- | sandbox/src/handle_dispatcher.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sandbox/src/broker_services.h b/sandbox/src/broker_services.h index 98760d9..1d9c730 100644 --- a/sandbox/src/broker_services.h +++ b/sandbox/src/broker_services.h @@ -72,7 +72,7 @@ class BrokerServicesBase : public BrokerServices, static DWORD WINAPI TargetEventsThread(PVOID param); // Removes a target peer from the process list if it expires. - static VOID CALLBACK RemovePeer(PVOID parameter, BOOLEAN); + static VOID CALLBACK RemovePeer(PVOID parameter, BOOLEAN timeout); // The completion port used by the job objects to communicate events to // the worker thread. diff --git a/sandbox/src/handle_dispatcher.cc b/sandbox/src/handle_dispatcher.cc index 1d74ed1..7a18cee 100644 --- a/sandbox/src/handle_dispatcher.cc +++ b/sandbox/src/handle_dispatcher.cc @@ -50,13 +50,14 @@ bool HandleDispatcher::DuplicateHandleProxy(IPCInfo* ipc, ResolveNTFunctionPtr("NtQueryObject", &QueryObject); // Get a copy of the handle for use in the broker process. - base::win::ScopedHandle handle; + HANDLE handle_temp; if (!::DuplicateHandle(ipc->client_info->process, source_handle, - ::GetCurrentProcess(), handle.Receive(), + ::GetCurrentProcess(), &handle_temp, 0, FALSE, DUPLICATE_SAME_ACCESS)) { ipc->return_info.win32_result = ::GetLastError(); return false; } + base::win::ScopedHandle handle(handle_temp); // Get the object type (32 characters is safe; current max is 14). BYTE buffer[sizeof(OBJECT_TYPE_INFORMATION) + 32 * sizeof(wchar_t)]; |