Complete fix for bug #8811 - sd_has_inheritable_components segfaults on an SD that...

[ddiss/samba.git] / source3 / smbd / file_access.c

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 9f95d68cf379c874278e9d514c1a30ec306008dc..bd65a709827e6ce01c3053ce8de9daccff3ba5b2 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -261,7 +261,10 @@ bool directory_has_default_acl(connection_struct *conn, const char *fname)
        NTSTATUS status = SMB_VFS_GET_NT_ACL(conn, fname,
                                SECINFO_DACL, &secdesc);
 
-       if (!NT_STATUS_IS_OK(status) || secdesc == NULL) {
+       if (!NT_STATUS_IS_OK(status) ||
+                       secdesc == NULL ||
+                       secdesc->dacl == NULL) {
+               TALLOC_FREE(secdesc);
                return false;
        }