[PATCH 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.

[Brendan Shanks (＠bshanks)]

Fixes exceptions seen in CEF and some advapi32 security tests.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/133

[PATCH 1/1] wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
 dlls/wow64/wow64_private.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h
index 1a9d05eaf43..b26148023db 100644
--- a/dlls/wow64/wow64_private.h
+++ b/dlls/wow64/wow64_private.h
@@ -146,17 +146,17 @@ static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, con
     out->Control  = sd->Control & ~SE_SELF_RELATIVE;
     if (sd->Control & SE_SELF_RELATIVE)
     {
-        if (sd->Owner) out->Owner = (PSID)((BYTE *)sd + sd->Owner);
-        if (sd->Group) out->Group = (PSID)((BYTE *)sd + sd->Group);
-        if ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) out->Sacl = (PSID)((BYTE *)sd + sd->Sacl);
-        if ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) out->Dacl = (PSID)((BYTE *)sd + sd->Dacl);
+        out->Owner = sd->Owner ? (PSID)((BYTE *)sd + sd->Owner) : NULL;
+        out->Group = sd->Group ? (PSID)((BYTE *)sd + sd->Group) : NULL;
+        out->Sacl = ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) ? (PSID)((BYTE *)sd + sd->Sacl) : NULL;
+        out->Dacl = ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) ? (PSID)((BYTE *)sd + sd->Dacl) : NULL;
     }
     else
     {
         out->Owner = ULongToPtr( sd->Owner );
         out->Group = ULongToPtr( sd->Group );
-        if (sd->Control & SE_SACL_PRESENT) out->Sacl = ULongToPtr( sd->Sacl );
-        if (sd->Control & SE_DACL_PRESENT) out->Dacl = ULongToPtr( sd->Dacl );
+        out->Sacl = (sd->Control & SE_SACL_PRESENT) ? ULongToPtr( sd->Sacl ) : NULL;
+        out->Dacl = (sd->Control & SE_DACL_PRESENT) ? ULongToPtr( sd->Dacl ) : NULL;
     }
     return out;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/133