Paul Bryan Roberts : advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly.
Alexandre Julliard
julliard at winehq.org
Tue Oct 21 07:07:04 CDT 2008
Module: wine
Branch: master
Commit: a37512ee63f33b69f3838c32a7a42abffb70d772
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37512ee63f33b69f3838c32a7a42abffb70d772
Author: Paul Bryan Roberts <pbronline-wine at yahoo.co.uk>
Date: Sat Oct 18 21:28:39 2008 +0100
advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly.
---
dlls/advapi32/security.c | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 03933d2..fcb048b 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -2536,7 +2536,26 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI
{
if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account))
{
- ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid);
+ DWORD sidLen = SECURITY_MAX_SID_SIZE;
+
+ pSid = HeapAlloc(GetProcessHeap(), 0, sidLen);
+
+ ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, pSid, &sidLen);
+
+ if (ret)
+ {
+ if (*cbSid < sidLen)
+ {
+ SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ ret = FALSE;
+ }
+ else if (Sid)
+ {
+ CopySid(*cbSid, Sid, pSid);
+ }
+
+ *cbSid = sidLen;
+ }
domainName = ACCOUNT_SIDS[i].domain;
nameLen = strlenW(domainName);
@@ -2559,6 +2578,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI
*peUse = ACCOUNT_SIDS[i].name_use;
}
+ HeapFree(GetProcessHeap(), 0, pSid);
+
return ret;
}
}
More information about the wine-cvs
mailing list