From aa18f62a8a9c0375adb4bf2c1103a510e9fd6310 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 8 May 2019 12:31:36 +1200 Subject: [PATCH] ldb: avoid NULL deref in ldb_dn_from_ldb_val (CID 1034730) Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer --- lib/ldb/common/ldb_dn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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; -- 2.47.3