Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 05:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[advapi32]

Browse source 
Alexander Yastrebov <menone7@gmail.com>
- Return proper lengths of required buffer sizes in characters (including the termination NULL character) in LookupAccountSid. Fixes 4 "advapi32_winetest security" failures.
See issue #4904 for more details.

svn path=/trunk/; revision=44117
This commit is contained in:
Aleksey Bragin 2009-11-12 13:55:51 +00:00
parent ba319b373f
commit 14442c0a34
1 changed files with 29 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

67
reactos/dll/win32/advapi32/sec/misc.c
View file

@ -1146,6 +1146,7 @@ LookupAccountSidW(LPCWSTR pSystemName,
PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain = NULL; PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain = NULL;
PLSA_TRANSLATED_NAME TranslatedName = NULL; PLSA_TRANSLATED_NAME TranslatedName = NULL;
BOOL ret; BOOL ret;
DWORD dwAccountName, dwDomainName;
RtlInitUnicodeString ( &SystemName, pSystemName ); RtlInitUnicodeString ( &SystemName, pSystemName );
Status = LsaOpenPolicy ( &SystemName, &ObjectAttributes, POLICY_LOOKUP_NAMES, &PolicyHandle ); Status = LsaOpenPolicy ( &SystemName, &ObjectAttributes, POLICY_LOOKUP_NAMES, &PolicyHandle );
@ -1166,47 +1167,35 @@ LookupAccountSidW(LPCWSTR pSystemName,
else else
{ {
ret = TRUE; ret = TRUE;
if ( TranslatedName )
{
DWORD dwSrcLen = TranslatedName->Name.Length / sizeof(WCHAR);
if ( *pdwAccountName <= dwSrcLen )
{
*pdwAccountName = dwSrcLen + 1;
ret = FALSE;
}
else
{
*pdwAccountName = dwSrcLen;
if (pAccountName)
{
RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length );
pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0';
}
}
if ( peUse )
*peUse = TranslatedName->Use;
}
if ( ReferencedDomain ) dwAccountName = TranslatedName->Name.Length / sizeof(WCHAR);
if (ReferencedDomain && ReferencedDomain->Entries > 0)
dwDomainName = ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR);
else
dwDomainName = 0;
if (*pdwAccountName <= dwAccountName || *pdwDomainName <= dwDomainName)
{ {
if ( ReferencedDomain->Entries > 0 ) /* One or two buffers are insufficient, add up a char for NULL termination */
{ *pdwAccountName = dwAccountName + 1;
DWORD dwSrcLen = ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR); *pdwDomainName = dwDomainName + 1;
if ( *pdwDomainName <= dwSrcLen ) ret = FALSE;
{ } else
*pdwDomainName = dwSrcLen + 1; {
ret = FALSE; /* Lengths are sufficient, copy the data */
} if(dwAccountName)
else RtlCopyMemory(pAccountName, TranslatedName->Name.Buffer, dwAccountName * sizeof(WCHAR));
{ pAccountName[dwAccountName] = L'\0';
*pdwDomainName = dwSrcLen;
if (pDomainName) if(dwDomainName)
{ RtlCopyMemory(pDomainName, ReferencedDomain->Domains[0].Name.Buffer, dwDomainName * sizeof(WCHAR));
RtlCopyMemory ( pDomainName, ReferencedDomain->Domains[0].Name.Buffer, ReferencedDomain->Domains[0].Name.Length ); pDomainName[dwDomainName] = L'\0';
pDomainName[ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR)] = L'\0';
} *pdwAccountName = dwAccountName;
} *pdwDomainName = dwDomainName;
}
if (peUse)
*peUse = TranslatedName->Use;
} }
if ( !ret ) if ( !ret )