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

dfs_server: get_dcs: fix pointer list termination

Browse Source 
Should fix a potential SEGV e.g. in case searched_site == NULL and no
objects with objectClass=site are found.

Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Arvid Requate 2014-03-31 18:45:07 +02:00 committed by Jeremy Allison
parent 32b35b8d92
commit c3719a6fee
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dfs_server/dfs_server_ad.c
View File

@ -366,7 +366,11 @@ static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb,
/* All of this was to get the DN of the searched_site */
sitedn = r->msgs[0]->dn;
set_list = talloc_realloc(subctx, set_list, struct dc_set *, current_pos+1);
/*
* We will realloc + 2 because we will need one additional place
* for element at current_pos + 1 for the NULL element
*/
set_list = talloc_realloc(subctx, set_list, struct dc_set *, current_pos+2);
if (set_list == NULL) {
TALLOC_FREE(subctx);
return NT_STATUS_NO_MEMORY;
@ -380,6 +384,9 @@ static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb,
set_list[current_pos]->names = NULL;
set_list[current_pos]->count = 0;
set_list[current_pos+1] = NULL;
status = get_dcs_insite(subctx, ldb, sitedn,
set_list[current_pos], need_fqdn);
if (!NT_STATUS_IS_OK(status)) {
@ -468,8 +475,6 @@ static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb,
}
}
}
current_pos++;
set_list[current_pos] = NULL;
*pset_list = talloc_move(ctx, &set_list);
talloc_free(subctx);