ITS#5358

diff --git a/CHANGES b/CHANGES
index 985cd2718e76503837f76bbf6ed8abf8ce497a91..476408ab508dcd6b1c44a5d7604492cead856d1b 100644 (file)
--- 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)
 
 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)
 
 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 ba448755073fdb6c01b0f368d838b656a6373255..6cebe9e04947de56b4071c0fb093a368e6f08cfd 100644 (file)
--- 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;
                } 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;
                }
 
                        goto return_results;
                }