reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

advapi32: Fix ComputeStringSidSize to work with SIDs with one sub authority.

Browse Source 
Use GetSidLengthRequired instead of computing the length in a way that 
won't always be correct.
This commit is contained in:
Rob Shearman 2007-07-18 18:06:36 +01:00 committed by Alexandre Julliard
parent 3f2d93b512
commit f56fe2c1bc
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/advapi32/security.c
View File

@ -3743,9 +3743,7 @@ BOOL WINAPI EnumDependentServicesW(
*/
static DWORD ComputeStringSidSize(LPCWSTR StringSid)
{
DWORD size = sizeof(SID);
if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */
if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */
{
int ctok = 0;
while (*StringSid)
@ -3755,8 +3753,8 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid)
StringSid++;
}
if (ctok > 3)
size += (ctok - 3) * sizeof(DWORD);
if (ctok >= 3)
return GetSidLengthRequired(ctok - 2);
}
else /* String constant format - Only available in winxp and above */
{
@ -3764,10 +3762,10 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid)
for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++)
if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2))
size += (WellKnownSids[i].Sid.SubAuthorityCount - 1) * sizeof(DWORD);
return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount);
}
return size;
return GetSidLengthRequired(0);
}
/******************************************************************************
@ -3796,7 +3794,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes)
if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */
{
DWORD i = 0, identAuth;
DWORD csubauth = ((*cBytes - sizeof(SID)) / sizeof(DWORD)) + 1;
DWORD csubauth = ((*cBytes - GetSidLengthRequired(0)) / sizeof(DWORD));
StringSid += 2; /* Advance to Revision */
pisid->Revision = atoiW(StringSid);