diff options
| author | Andreas Schneider <asn@samba.org> | 2018-06-21 11:11:58 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-06-27 14:52:13 +0200 |
| commit | e728f9f4e0c4a2a196b87d02f33892cdd0e032c2 (patch) | |
| tree | b1ae3af90affc54d06e179d3b723f932f91fff12 /source4 | |
| parent | 84bac589f3d4f8ce7131d374963f275ea80af80b (diff) | |
| download | samba-e728f9f4e0c4a2a196b87d02f33892cdd0e032c2.tar.gz | |
s4:kcc: Add a NULL check before qsort()
../source4/dsdb/kcc/kcc_topology.c: In function ‘kcctpl_get_all_bridgehead_dcs.constprop’:
../source4/dsdb/kcc/kcc_topology.c:1330:3: error: argument 1 null where non-null expected [-Werror=nonnull]
qsort(bridgeheads.data, bridgeheads.count,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13437
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(v4-7-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-7-test): Wed Jun 27 14:52:13 CEST 2018 on sn-devel-144
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/kcc/kcc_topology.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/dsdb/kcc/kcc_topology.c b/source4/dsdb/kcc/kcc_topology.c index 0e136ed7936..de69f0ab0e3 100644 --- a/source4/dsdb/kcc/kcc_topology.c +++ b/source4/dsdb/kcc/kcc_topology.c @@ -1327,6 +1327,11 @@ static NTSTATUS kcctpl_get_all_bridgehead_dcs(struct kccsrv_service *service, } if (site_opts & NTDSSETTINGS_OPT_IS_RAND_BH_SELECTION_DISABLED) { + if (bridgeheads.data == NULL || bridgeheads.count == 0) { + talloc_free(tmp_ctx); + return NT_STATUS_INVALID_PARAMETER; + } + qsort(bridgeheads.data, bridgeheads.count, sizeof(struct ldb_message), kcctpl_sort_bridgeheads); } else { |