sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22675: Simo's patch for 0 size allocation. Still need

Browse Source 
to examine parse_misc.c fix.
Jeremy.
This commit is contained in:
Jeremy Allison 2007-05-04 22:01:26 +00:00 committed by Gerald (Jerry) Carter
parent 9e4c6ab739
commit 80d981265c
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/modules/vfs_afsacl.c
View File

@ -616,7 +616,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
uid_to_sid(&owner_sid, sbuf.st_uid);
gid_to_sid(&group_sid, sbuf.st_gid);
if (num_aces) {
if (afs_acl->num_aces) {
nt_ace_list = TALLOC_ARRAY(mem_ctx, SEC_ACE, afs_acl->num_aces);
if (nt_ace_list == NULL)

17
source/nsswitch/idmap.c
View File

@ -1025,17 +1025,16 @@ static NTSTATUS idmap_backends_sids_to_unixids(struct id_map **ids)
DEBUG(10, ("Query backends to map sids->ids\n"));
/* split list per domain */
if (num_domains) {
dom_ids = TALLOC_ZERO_ARRAY(ctx, struct id_map **, num_domains);
IDMAP_CHECK_ALLOC(dom_ids);
counters = TALLOC_ZERO_ARRAY(ctx, int, num_domains);
IDMAP_CHECK_ALLOC(counters);
} else {
dom_ids = NULL;
counters = NULL;
if (num_domains == 0) {
DEBUG(1, ("No domains available?\n"));
return NT_STATUS_UNSUCCESSFUL;
}
dom_ids = TALLOC_ZERO_ARRAY(ctx, struct id_map **, num_domains);
IDMAP_CHECK_ALLOC(dom_ids);
counters = TALLOC_ZERO_ARRAY(ctx, int, num_domains);
IDMAP_CHECK_ALLOC(counters);
/* partition the requests by domain */
for (i = 0; ids[i]; i++) {

5
source/nsswitch/winbindd_async.c
View File

@ -273,6 +273,11 @@ enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
DEBUG(3, ("[%5lu]: sids to unix ids\n", (unsigned long)state->pid));
if (state->request.extra_len == 0) {
DEBUG(0, ("Invalid buffer size!\n"));
return WINBINDD_ERROR;
}
sids = (DOM_SID *)state->request.extra_data.data;
num = state->request.extra_len / sizeof(DOM_SID);

8
source/rpc_client/cli_svcctl.c
View File

@ -209,8 +209,12 @@ WERROR rpccli_svcctl_enumerate_services( struct rpc_pipe_client *cli, TALLOC_CTX
return out.status;
/* pull out the data */
if ( !(services = TALLOC_ARRAY( mem_ctx, ENUM_SERVICES_STATUS, out.returned )) )
return WERR_NOMEM;
if (out.returned) {
if ( !(services = TALLOC_ARRAY( mem_ctx, ENUM_SERVICES_STATUS, out.returned )) )
return WERR_NOMEM;
} else {
services = NULL;
}
for ( i=0; i<out.returned; i++ ) {
svcctl_io_enum_services_status( "", &services[i], &out.buffer, 0 );

16
source/rpc_server/srv_lsa_nt.c
View File

@ -825,7 +825,11 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
*pp_mapped_count = 0;
*pp_ref = NULL;
*pp_names = NULL;
if (num_sids == 0) {
return NT_STATUS_OK;
}
names = TALLOC_ZERO_P(p->mem_ctx, LSA_TRANS_NAME_ENUM2);
sids = TALLOC_ARRAY(p->mem_ctx, const DOM_SID *, num_sids);
ref = TALLOC_ZERO_P(p->mem_ctx, DOM_R_REF);
@ -845,12 +849,10 @@ static NTSTATUS _lsa_lookup_sids_internal(pipes_struct *p,
return status;
}
if (num_sids > 0) {
names->name = TALLOC_ARRAY(names, LSA_TRANS_NAME2, num_sids);
names->uni_name = TALLOC_ARRAY(names, UNISTR2, num_sids);
if ((names->name == NULL) || (names->uni_name == NULL)) {
return NT_STATUS_NO_MEMORY;
}
names->name = TALLOC_ARRAY(names, LSA_TRANS_NAME2, num_sids);
names->uni_name = TALLOC_ARRAY(names, UNISTR2, num_sids);
if ((names->name == NULL) || (names->uni_name == NULL)) {
return NT_STATUS_NO_MEMORY;
}
for (i=0; i<MAX_REF_DOMAINS; i++) {