ITS#5358

diff --git a/CHANGES b/CHANGES
index 41cb6035c921f7267f9397e26ccf8d021fe6b10c..b6365bdfc6b5f3e85c43907b06c98d87ac62bab1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.4.8 Engineering
        Fixed slapd cn=config crash on delete (ITS#5343)
        Fixed slapd cn=config global acls (ITS#5352)
        Fixed slapd str2entry with no attrs (ITS#5308)
+       Fixed slapd-bdb crash with modrdn (ITS#5358)
        Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
        Fixed slapd-bdb modrdn to same dn (ITS#5319)
        Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index bc13df5ef674f491fc03906e7491947eb1ebeeb5..117cb05c25b2d0b939799a98b2c21e8930f1104c 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -739,6 +739,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;
                }