From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 8 May 2019 00:49:53 +0000 (+1200)
Subject: ldb_ldif: avoid NULL dereference with unexpected arguments (CID 1107195)
X-Git-Tag: tdb-1.4.1~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dc86038835e607ba132a206b91320f12e7728af;p=thirdparty%2Fsamba.git

ldb_ldif: avoid NULL dereference with unexpected arguments (CID 1107195)

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_ldif.c b/lib/ldb/common/ldb_ldif.c
index e69467891c9..2bd02663f09 100644
--- a/lib/ldb/common/ldb_ldif.c
+++ b/lib/ldb/common/ldb_ldif.c
@@ -728,7 +728,7 @@ int ldb_ldif_parse_modrdn(struct ldb_context *ldb,
 	if (_deleteoldrdn) {
 		*_deleteoldrdn = deleteoldrdn;
 	}
-	if (_newsuperior) {
+	if (_newsuperior != NULL && _newrdn != NULL) {
 		if (newsuperior_val) {
 			*_newrdn = talloc_move(mem_ctx, &newrdn);
 		} else {