summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaks Naumov <maksqwe1@ukr.net>2015-02-10 09:43:45 +0200
committerMaks Naumov <maksqwe1@ukr.net>2015-02-10 09:43:45 +0200
commit2c865469164598765c0431abcd4b329b656ef832 (patch)
treeb3d81bff7d8340c48ac9e1e28b1d58f01bdcb25f /src
parentd92129870bcdeb1ed04cb73cce14874a905848d8 (diff)
downloadcoreclr-2c865469164598765c0431abcd4b329b656ef832.tar.gz
coreclr-2c865469164598765c0431abcd4b329b656ef832.tar.bz2
coreclr-2c865469164598765c0431abcd4b329b656ef832.zip
Properly check return value of OpenProcessToken()
Return type of OpenProcessToken() is BOOL.
Diffstat (limited to 'src')
-rw-r--r--src/utilcode/securitywrapper.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/utilcode/securitywrapper.cpp b/src/utilcode/securitywrapper.cpp
index 249fe494e1..1fa8fca54a 100644
--- a/src/utilcode/securitywrapper.cpp
+++ b/src/utilcode/securitywrapper.cpp
@@ -419,16 +419,11 @@ HRESULT SidBuffer::InitFromProcessAppContainerSidNoThrow(DWORD pid)
goto exit;
}
HANDLE hToken = NULL;
- hr = OpenProcessToken(hProcess, TOKEN_QUERY, &hToken);
- if (FAILED(hr))
+ if (!OpenProcessToken(hProcess, TOKEN_QUERY, &hToken))
{
+ hr = HRESULT_FROM_GetLastError();
goto exit;
}
- else
- {
- hr = S_OK; // not sure why, but OpenProcessToken can return S_FALSE
- // we don't want to return S_FALSE by accident
- }
// Define new TOKEN_INFORMATION_CLASS/ TOKEN_APPCONTAINER_INFORMATION members for Win8 since they are not in the DevDiv copy of WinSDK yet
typedef enum _TOKEN_INFORMATION_CLASS_WIN8 {