summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-03-13 19:26:02 -0700
committerJeremy Allison <jra@samba.org>2012-03-14 05:08:03 +0100
commit2d35fd7259bb8ad9a4a6a0c0b8d7a4f1cdf78c12 (patch)
tree2179838e859a515b19ad82870bb687d0da5df5df /libcli
parent44590c1b70c0a24f853c02d5fcdb3c609401e2ca (diff)
downloadsamba-2d35fd7259bb8ad9a4a6a0c0b8d7a4f1cdf78c12.tar.gz
samba-2d35fd7259bb8ad9a4a6a0c0b8d7a4f1cdf78c12.tar.bz2
samba-2d35fd7259bb8ad9a4a6a0c0b8d7a4f1cdf78c12.zip
Fix bug #8811 - sd_has_inheritable_components segfaults on an SD that se_access_check accepts.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Mar 14 05:08:03 CET 2012 on sn-devel-104
Diffstat (limited to 'libcli')
-rw-r--r--libcli/security/secdesc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index fcd0828963..84128e4acd 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -542,6 +542,10 @@ bool sd_has_inheritable_components(const struct security_descriptor *parent_ctr,
unsigned int i;
const struct security_acl *the_acl = parent_ctr->dacl;
+ if (the_acl == NULL) {
+ return false;
+ }
+
for (i = 0; i < the_acl->num_aces; i++) {
const struct security_ace *ace = &the_acl->aces[i];