diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 02:51:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:49 -0500 |
| commit | 56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382 (patch) | |
| tree | fe800dc017985b616874b79ffad6122a1e5bde34 /source3/lib | |
| parent | be8b0685a55700c6bce3681734800ec6434b0364 (diff) | |
| download | samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.gz samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.bz2 samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.zip | |
r22590: Make TALLOC_ARRAY consistent across all uses.
That should be it....
Jeremy.
(This used to be commit 603233a98bbf65467c8b4f04719d771c70b3b4c9)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/secace.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/lib/secace.c b/source3/lib/secace.c index d60722c57e..871c983533 100644 --- a/source3/lib/secace.c +++ b/source3/lib/secace.c @@ -122,8 +122,12 @@ NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, SEC_ACE **pp_new, SEC_ACE *old, uint32 if (!ctx || !pp_new || !old || !sid || !num) return NT_STATUS_INVALID_PARAMETER; - if((pp_new[0] = TALLOC_ZERO_ARRAY(ctx, SEC_ACE, *num )) == 0) - return NT_STATUS_NO_MEMORY; + if (*num) { + if((pp_new[0] = TALLOC_ZERO_ARRAY(ctx, SEC_ACE, *num )) == 0) + return NT_STATUS_NO_MEMORY; + } else { + pp_new[0] = NULL; + } for (i = 0; i < *num; i ++) { if (sid_compare(&old[i].trustee, sid) != 0) |