Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
Fix SepGet*FromDescriptor, returning NULL, when the relative offset is 0.
Fixes VMware tools installer.

svn path=/trunk/; revision=56356
This commit is contained in:
Timo Kreuzer 2012-04-18 11:27:03 +00:00
parent 615239a26b
commit ebccbcb163
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/ntoskrnl/se/sd.c
View file

@ -38,6 +38,7 @@ SepGetGroupFromDescriptor(PVOID _Descriptor)
if (Descriptor->Control & SE_SELF_RELATIVE) if (Descriptor->Control & SE_SELF_RELATIVE)
{ {
SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor; SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor;
if (!SdRel->Group) return NULL;
return (PSID)((ULONG_PTR)Descriptor + SdRel->Group); return (PSID)((ULONG_PTR)Descriptor + SdRel->Group);
} }
else else
@ -56,6 +57,7 @@ SepGetOwnerFromDescriptor(PVOID _Descriptor)
if (Descriptor->Control & SE_SELF_RELATIVE) if (Descriptor->Control & SE_SELF_RELATIVE)
{ {
SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor; SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor;
if (!SdRel->Owner) return NULL;
return (PSID)((ULONG_PTR)Descriptor + SdRel->Owner); return (PSID)((ULONG_PTR)Descriptor + SdRel->Owner);
} }
else else
@ -74,6 +76,7 @@ SepGetDaclFromDescriptor(PVOID _Descriptor)
if (Descriptor->Control & SE_SELF_RELATIVE) if (Descriptor->Control & SE_SELF_RELATIVE)
{ {
SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor; SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor;
if (!SdRel->Dacl) return NULL;
return (PACL)((ULONG_PTR)Descriptor + SdRel->Dacl); return (PACL)((ULONG_PTR)Descriptor + SdRel->Dacl);
} }
else else
@ -92,6 +95,7 @@ SepGetSaclFromDescriptor(PVOID _Descriptor)
if (Descriptor->Control & SE_SELF_RELATIVE) if (Descriptor->Control & SE_SELF_RELATIVE)
{ {
SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor; SdRel = (PISECURITY_DESCRIPTOR_RELATIVE)Descriptor;
if (!SdRel->Sacl) return NULL;
return (PACL)((ULONG_PTR)Descriptor + SdRel->Sacl); return (PACL)((ULONG_PTR)Descriptor + SdRel->Sacl);
} }
else else