summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-02-22 06:35:54 +0000
committerAndrew Tridgell <tridge@samba.org>2001-02-22 06:35:54 +0000
commitb4096748dd5613f7c6f7d8c6d73c5ff0fba0c346 (patch)
treed764be06ed0e2bc7f9edbf1d7861e0d09644adf2
parent6022747b5bbc3197d3a0e246c57caf1b7ad04b2d (diff)
downloadsamba-b4096748dd5613f7c6f7d8c6d73c5ff0fba0c346.tar.gz
samba-b4096748dd5613f7c6f7d8c6d73c5ff0fba0c346.tar.bz2
samba-b4096748dd5613f7c6f7d8c6d73c5ff0fba0c346.zip
don't crash on null acl sort
(This used to be commit 59341377413fcbf30c090a3763608d23ac2bff95)
-rw-r--r--source3/utils/smbcacls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index bef16d349c..5ea595c4ea 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -544,6 +544,8 @@ static void sort_acl(SEC_ACL *the_acl)
int i, ace_ndx = 0;
BOOL do_denied = True;
+ if (!the_acl) return;
+
tmp_ace = (SEC_ACE *)malloc(sizeof(SEC_ACE) * the_acl->num_aces);
if (!tmp_ace) return;