From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 11 Apr 2007 20:32:24 +0000 (+0000)
Subject: import fix to ITS#4925
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8a49db5f0a9fd7e7a1856ee5bc360ecc0c7dddd;p=thirdparty%2Fopenldap.git

import fix to ITS#4925
---

diff --git a/CHANGES b/CHANGES
index c67c434b85..736990eb5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.36 Engineering
+	Fixed slapd-bdb no-op crasher (ITS#4925)
 	Fixed libldap response code handling on rebind (ITS#4924)
 
 OpenLDAP 2.3.35 Release (2007/04/09)
diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 0be38ee3e3..6814f4f941 100644
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -538,6 +538,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;
 		}
 	} else {