diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 01:17:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:47 -0500 |
| commit | 1e362c0e7fff603cffa32863a5b07ecbc50f8a2d (patch) | |
| tree | 59850105addaeccbcf5a9d9d90d18a784edab8f5 /source3/rpc_server/srv_samr_nt.c | |
| parent | 6b605a9cd783451072e0bb9f63eb0e29d7969cd4 (diff) | |
| download | samba-1e362c0e7fff603cffa32863a5b07ecbc50f8a2d.tar.gz samba-1e362c0e7fff603cffa32863a5b07ecbc50f8a2d.tar.bz2 samba-1e362c0e7fff603cffa32863a5b07ecbc50f8a2d.zip | |
r22587: Ensure TALLOC_ZERO_ARRAY is consistent.
Jeremy.
(This used to be commit c3df5d08dd6a983f9d53dc6628a50e571d322e8d)
Diffstat (limited to 'source3/rpc_server/srv_samr_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 8f7bfd6b01..1b9a8c375b 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -3939,10 +3939,14 @@ NTSTATUS _samr_query_groupmem(pipes_struct *p, SAMR_Q_QUERY_GROUPMEM *q_u, SAMR_ if (!NT_STATUS_IS_OK(result)) return result; - attr=TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_members); - - if ((num_members!=0) && (attr==NULL)) - return NT_STATUS_NO_MEMORY; + if (num_members) { + attr=TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_members); + if (attr == NULL) { + return NT_STATUS_NO_MEMORY; + } + } else { + attr = NULL; + } for (i=0; i<num_members; i++) attr[i] = SID_NAME_USER; |