import fix to ITS#4925

diff --git a/CHANGES b/CHANGES
index c67c434b8520da5634712d98b8a411362c04c8e7..736990eb5e74570fcc1cb9a5d3e427ab73314681 100644 (file)
--- 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 0be38ee3e3d360111c869cd23099734e718417b0..6814f4f9414ee8ab479afac63784ccbab85cfe95 100644 (file)
--- 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 {