aboutsummaryrefslogtreecommitdiff
path: root/qga/vss-win32
diff options
context:
space:
mode:
authorMichael Roth <mdroth@linux.vnet.ibm.com>2017-10-26 19:53:45 -0500
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-10-26 20:01:32 -0500
commit8cedc80555e5a395a4fda7130b0115015e775c48 (patch)
tree2651c66a40af16f8ed2e8395e7c1a6e4764a87f3 /qga/vss-win32
parent53f9fcb263e40ff82b9fcbce8b8cba0f3649ac9b (diff)
downloadqemu-8cedc80555e5a395a4fda7130b0115015e775c48.zip
qemu-8cedc80555e5a395a4fda7130b0115015e775c48.tar.gz
qemu-8cedc80555e5a395a4fda7130b0115015e775c48.tar.bz2
qga-win: fix error-handling in getNameByStringSID()
In one case we misconstrue a BOOL return as an HRESULT, and in the other case we don't check the BOOL return from LookupAccountSidW() before extracting the HRESULT from GetLastError(). Both can lead to getNameByStringSID() misreporting an error. Reported-by: Chen Hanxiao <chenhanxiao@gmail.com> Suggested-by: Tomáš Golembiovský <tgolembi@redhat.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'qga/vss-win32')
-rw-r--r--qga/vss-win32/install.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index ba7c94e..6713e58 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -148,10 +148,15 @@ static HRESULT getNameByStringSID(
DWORD domainNameLen = BUFFER_SIZE;
wchar_t domainName[BUFFER_SIZE];
- chk(ConvertStringSidToSidW(sid, &psid));
- LookupAccountSidW(NULL, psid, buffer, bufferLen,
- domainName, &domainNameLen, &groupType);
- hr = HRESULT_FROM_WIN32(GetLastError());
+ if (!ConvertStringSidToSidW(sid, &psid)) {
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ goto out;
+ }
+ if (!LookupAccountSidW(NULL, psid, buffer, bufferLen,
+ domainName, &domainNameLen, &groupType)) {
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ /* Fall through and free psid */
+ }
LocalFree(psid);