Rob Shearman : ntdll: Fix NtAccessCheck for NULL, but present SACLs and DACLs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a9ffa82c6d9d90e1cbc0531cc329eca94c6884ca
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a9ffa82c6d9d90e1cbc0531cc3...

Author: Rob Shearman 
Date:   Tue Oct 16 09:49:53 2007 +0100

ntdll: Fix NtAccessCheck for NULL, but present SACLs and DACLs.

---

dlls/ntdll/sec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index e827efa..e4f6ddc 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -1538,9 +1538,9 @@ NtAccessCheck(
         RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted );
         sd.group_len = RtlLengthSid( group );
         RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted );
-        sd.sacl_len = (present ? sacl->AclSize : 0);
+        sd.sacl_len = ((present && sacl) ? sacl->AclSize : 0);
         RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted );
-        sd.dacl_len = (present ? dacl->AclSize : 0);
+        sd.dacl_len = ((present && dacl) ? dacl->AclSize : 0);

wine_server_add_data( req, &sd, sizeof(sd) );
         wine_server_add_data( req, owner, sd.owner_len );