Attachment 13442 Details for Bug 12930 – additional patch for 4.7

[patch] additional patch for 4.7

gcc_47.patch (text/plain), 2.44 KB, created by Andreas Schneider on 2017-08-01 11:38:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2017-08-01 11:38:18 UTC

Size: 2.44 KB

patch

obsolete

>From b90a83c256b93eb9ccdbf7d5971cd239ea9df727 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Mon, 24 Jul 2017 12:13:50 +0200
>Subject: [PATCH 1/2] s4:kcc: Add a NULL check before qsort()
>
>This fixes building with GCC 7.1.1
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12930
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>(cherry picked from commit 314cf608932c21d593afd04769b07435bcd4fc53)
>---
> source4/dsdb/kcc/kcc_topology.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/source4/dsdb/kcc/kcc_topology.c b/source4/dsdb/kcc/kcc_topology.c
>index cd4dcc55495..0e136ed7936 100644
>--- a/source4/dsdb/kcc/kcc_topology.c
>+++ b/source4/dsdb/kcc/kcc_topology.c
>@@ -2445,6 +2445,10 @@ static NTSTATUS kcctpl_kruskal(TALLOC_CTX *mem_ctx, struct kcctpl_graph *graph,
> 	uint32_t i, num_expected_tree_edges, cst_edges;
> 	struct kcctpl_multi_edge_list output_edges;
> 
>+	if (internal_edges.data == NULL || internal_edges.count == 0) {
>+		return NT_STATUS_INVALID_PARAMETER;
>+	}
>+
> 	num_expected_tree_edges = 0;
> 	for (i = 0; i < graph->vertices.count; i++) {
> 		struct kcctpl_vertex *vertex = &graph->vertices.data[i];
>-- 
>2.13.3
>
>
>From 157c6add1c377aa5cb06469b616b8b6660e99745 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Mon, 24 Jul 2017 12:19:27 +0200
>Subject: [PATCH 2/2] mit-kdb: Fix NULL pointer check after malloc
>
>This fixes building with GCC 7.1.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12930
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Mon Jul 24 18:45:34 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 9b64b11c2f2c1bc77ae887b34d7efcb9f1452da7)
>---
> source4/kdc/mit-kdb/kdb_samba_pac.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source4/kdc/mit-kdb/kdb_samba_pac.c b/source4/kdc/mit-kdb/kdb_samba_pac.c
>index 0ab8c372e0e..15497603b10 100644
>--- a/source4/kdc/mit-kdb/kdb_samba_pac.c
>+++ b/source4/kdc/mit-kdb/kdb_samba_pac.c
>@@ -87,7 +87,7 @@ krb5_error_code kdb_samba_dbekd_encrypt_key_data(krb5_context context,
> 	key_data->key_data_kvno = keyver;
> 	key_data->key_data_type[0] = kkey->enctype;
> 	key_data->key_data_contents[0] = malloc(kkey->length);
>-	if (key_data->key_data_contents[0]) {
>+	if (key_data->key_data_contents[0] == NULL) {
> 		return ENOMEM;
> 	}
> 	memcpy(key_data->key_data_contents[0],
>-- 
>2.13.3
>

Flags:

slow: review+

Actions: View

Attachments on bug 12930: 13428 | 13429 | 13442 | 13467