From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 2 May 2019 21:46:04 +0000 (+1200)
Subject: rpc/dnsdata: do not crash if message attr missing (CID: 1414773)
X-Git-Tag: tdb-1.4.1~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9e6300a5d49182f3c05fd3f11cf056015854820;p=thirdparty%2Fsamba.git

rpc/dnsdata: do not crash if message attr missing (CID: 1414773)

This should be hard to trigger, but goto fail is always nicer than sig 11.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 59e29f029a6..6a211ad9efd 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -794,6 +794,11 @@ struct dns_tree *dns_build_tree(TALLOC_CTX *mem_ctx, const char *name, struct ld
 	/* Add all names in the result in a tree */
 	for (i=0; i<res->count; i++) {
 		ptr = ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL);
+		if (ptr == NULL) {
+			DBG_ERR("dnsserver: dns record has no name (%s)",
+				ldb_dn_get_linearized(res->msgs[i]->dn));
+			goto failed;
+		}
 
 		if (strcmp(ptr, "@") == 0) {
 			base->data = res->msgs[i];