Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-24 09:10:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETAPI32]

Browse source 
NetLocalGroupGetMembers:
- Do not try to add the size of a domain name to the return buffer if the domain index is negative.
- Do not try to copy a domain name to the return buffer if the domain index is negative.
- Move the write pointer after writing the domain name.

svn path=/trunk/; revision=60125
This commit is contained in:
Eric Kohl 2013-09-15 09:11:32 +00:00
parent 1a0117e43e
commit cbe1c706cd
1 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

45
reactos/dll/win32/netapi32/local_group.c
View file

@ -1528,14 +1528,16 @@ NetLocalGroupGetMembers(
case 2: case 2:
Size += sizeof(LOCALGROUP_MEMBERS_INFO_2) + Size += sizeof(LOCALGROUP_MEMBERS_INFO_2) +
RtlLengthSid(EnumContext->Sids[i]) + RtlLengthSid(EnumContext->Sids[i]) +
EnumContext->Names[i].Name.Length + sizeof(WCHAR) + EnumContext->Names[i].Name.Length + sizeof(WCHAR);
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); if (EnumContext->Names[i].DomainIndex >= 0)
Size += EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR);
break; break;
case 3: case 3:
Size += sizeof(LOCALGROUP_MEMBERS_INFO_3) + Size += sizeof(LOCALGROUP_MEMBERS_INFO_3) +
EnumContext->Names[i].Name.Length + sizeof(WCHAR) + EnumContext->Names[i].Name.Length + sizeof(WCHAR);
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); if (EnumContext->Names[i].DomainIndex >= 0)
Size += EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR);
break; break;
default: default:
@ -1609,6 +1611,7 @@ NetLocalGroupGetMembers(
memcpy(MembersInfo1->lgrmi1_name, memcpy(MembersInfo1->lgrmi1_name,
EnumContext->Names[i].Name.Buffer, EnumContext->Names[i].Name.Buffer,
EnumContext->Names[i].Name.Length); EnumContext->Names[i].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Names[i].Name.Length + sizeof(WCHAR));
MembersInfo1++; MembersInfo1++;
break; break;
@ -1625,37 +1628,47 @@ NetLocalGroupGetMembers(
MembersInfo2->lgrmi2_sidusage = EnumContext->Names[i].Use; MembersInfo2->lgrmi2_sidusage = EnumContext->Names[i].Use;
MembersInfo2->lgrmi2_domainandname = (LPWSTR)Ptr; MembersInfo2->lgrmi2_domainandname = (LPWSTR)Ptr;
memcpy(MembersInfo2->lgrmi2_domainandname,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); if (EnumContext->Names[i].DomainIndex >= 0)
{
memcpy(MembersInfo2->lgrmi2_domainandname,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
*((LPWSTR)Ptr) = L'\\'; Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR)); *((LPWSTR)Ptr) = L'\\';
Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR));
}
memcpy(Ptr, memcpy(Ptr,
EnumContext->Names[i].Name.Buffer, EnumContext->Names[i].Name.Buffer,
EnumContext->Names[i].Name.Length); EnumContext->Names[i].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Names[i].Name.Length + sizeof(WCHAR));
MembersInfo2++; MembersInfo2++;
break; break;
case 3: case 3:
MembersInfo3->lgrmi3_domainandname = (PSID)Ptr; MembersInfo3->lgrmi3_domainandname = (PSID)Ptr;
memcpy(MembersInfo2->lgrmi2_domainandname,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length); if (EnumContext->Names[i].DomainIndex >= 0)
{
memcpy(MembersInfo2->lgrmi2_domainandname,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Buffer,
EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
*((LPWSTR)Ptr) = L'\\'; Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR)); *((LPWSTR)Ptr) = L'\\';
Ptr = (PVOID)((ULONG_PTR)Ptr + sizeof(WCHAR));
}
memcpy(Ptr, memcpy(Ptr,
EnumContext->Names[i].Name.Buffer, EnumContext->Names[i].Name.Buffer,
EnumContext->Names[i].Name.Length); EnumContext->Names[i].Name.Length);
Ptr = (PVOID)((ULONG_PTR)Ptr + EnumContext->Names[i].Name.Length + sizeof(WCHAR));
MembersInfo3++; MembersInfo3++;
break; break;
} }