36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From c2bbe774ce03661666a1f48922a9ab681ef4f64b Mon Sep 17 00:00:00 2001
|
|
From: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Date: Tue, 14 Sep 2021 11:08:41 +1200
|
|
Subject: [PATCH] ldb_msg: Don't fail in ldb_msg_copy() if source DN is NULL
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14836
|
|
|
|
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
---
|
|
lib/ldb/common/ldb_msg.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/ldb/common/ldb_msg.c b/lib/ldb/common/ldb_msg.c
|
|
index 0179c35659b..57dfc5a04c2 100644
|
|
--- a/lib/ldb/common/ldb_msg.c
|
|
+++ b/lib/ldb/common/ldb_msg.c
|
|
@@ -876,8 +876,10 @@ struct ldb_message *ldb_msg_copy(TALLOC_CTX *mem_ctx,
|
|
msg2 = ldb_msg_copy_shallow(mem_ctx, msg);
|
|
if (msg2 == NULL) return NULL;
|
|
|
|
- msg2->dn = ldb_dn_copy(msg2, msg2->dn);
|
|
- if (msg2->dn == NULL) goto failed;
|
|
+ if (msg2->dn != NULL) {
|
|
+ msg2->dn = ldb_dn_copy(msg2, msg2->dn);
|
|
+ if (msg2->dn == NULL) goto failed;
|
|
+ }
|
|
|
|
for (i=0;i<msg2->num_elements;i++) {
|
|
struct ldb_message_element *el = &msg2->elements[i];
|
|
--
|
|
2.25.1
|
|
|