From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 8 May 2019 00:31:36 +0000 (+1200)
Subject: ldb: avoid NULL deref in ldb_dn_from_ldb_val (CID 1034730)
X-Git-Tag: tdb-1.4.1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa18f62a8a9c0375adb4bf2c1103a510e9fd6310;p=thirdparty%2Fsamba.git

ldb: avoid NULL deref in ldb_dn_from_ldb_val (CID 1034730)

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

diff --git a/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
index a2122a8a80a..2e98f391467 100644
--- a/lib/ldb/common/ldb_dn.c
+++ b/lib/ldb/common/ldb_dn.c
@@ -92,9 +92,10 @@ struct ldb_dn *ldb_dn_from_ldb_val(TALLOC_CTX *mem_ctx,
 {
 	struct ldb_dn *dn;
 
-	if (! ldb) return NULL;
-
-	if (strdn && strdn->data
+	if (ldb == NULL || strdn == NULL) {
+		return NULL;
+	}
+	if (strdn->data
 	    && (strnlen((const char*)strdn->data, strdn->length) != strdn->length)) {
 		/* The RDN must not contain a character with value 0x0 */
 		return NULL;