diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 00:48:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:47 -0500 |
| commit | 61f95f1f9759383a8b1ffaf7da6100865144156f (patch) | |
| tree | 766d0cac06a07659ef8863e9ac347b8213dd455e /source3/rpc_parse/parse_net.c | |
| parent | 84c37a1fe2f6a30f14a50028457bcafc85a63a41 (diff) | |
| download | samba-61f95f1f9759383a8b1ffaf7da6100865144156f.tar.gz samba-61f95f1f9759383a8b1ffaf7da6100865144156f.tar.bz2 samba-61f95f1f9759383a8b1ffaf7da6100865144156f.zip | |
r22585: Get us into a consistent state with TALLOC_ZERO_ARRAY also.
Jeremy.
(This used to be commit c622fb8536d955952a0fbf2441a4cb45a9feb9b0)
Diffstat (limited to 'source3/rpc_parse/parse_net.c')
| -rw-r--r-- | source3/rpc_parse/parse_net.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index d821cf85f0..4c2f676831 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -1106,9 +1106,13 @@ static int init_dom_sid2s(TALLOC_CTX *ctx, const char *sids_str, DOM_SID2 **ppsi } /* Now allocate space for them. */ - *ppsids = TALLOC_ZERO_ARRAY(ctx, DOM_SID2, count); - if (*ppsids == NULL) - return 0; + if (count) { + *ppsids = TALLOC_ZERO_ARRAY(ctx, DOM_SID2, count); + if (*ppsids == NULL) + return 0; + } else { + *ppsids = NULL; + } sids = *ppsids; @@ -1590,9 +1594,13 @@ void init_net_user_info3(TALLOC_CTX *ctx, NET_USER_INFO_3 *usr, usr->num_groups2 = num_groups; - usr->gids = TALLOC_ZERO_ARRAY(ctx,DOM_GID,num_groups); - if (usr->gids == NULL && num_groups>0) - return; + if (num_groups) { + usr->gids = TALLOC_ZERO_ARRAY(ctx,DOM_GID,num_groups); + if (usr->gids == NULL) + return; + } else { + usr->gids = NULL; + } for (i = 0; i < num_groups; i++) usr->gids[i] = gids[i]; |