From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 8 Feb 2008 19:18:56 +0000 (+0000)
Subject: ITS#5358
X-Git-Tag: OPENLDAP_REL_ENG_2_3_41~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32701cd977dd83e8a637ee88d45998d91376cefb;p=thirdparty%2Fopenldap.git

ITS#5358
---

diff --git a/CHANGES b/CHANGES
index 985cd2718e..476408ab50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.41 Engineering
 	Fixed syncrepl propagation of errors (ITS#5282)
+	Fixed crash when no-op control is used (ITS#5358)
 
 OpenLDAP 2.3.40 Release (2007/12/25)
 	Fixed slapd include handling (ITS#5276)
diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index ba44875507..6cebe9e049 100644
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -729,6 +729,8 @@ retry:	/* transaction retry */
 		} else {
 			rs->sr_err = LDAP_X_NO_OPERATION;
 			ltid = NULL;
+			/* Only free attrs if they were dup'd.  */
+			if ( dummy.e_attrs == e->e_attrs ) dummy.e_attrs = NULL;
 			goto return_results;
 		}