Apply Hallvard's modtail twice freed bug fix from -devel.

diff --git a/CHANGES b/CHANGES
index 439363ec93ba806cecb8f1ccbb0bfd1412cf0b5b..30ec6ea532587fd66be3e0a57373697f3799e058 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,9 +6,10 @@ Changes included in OpenLDAP 1.1.1
        Updated slapd/ldif2dbm to disable write sync'ing
        Fixed slapd & slurpd syslogging (ITS#6)
        Fixed libldif/line64 analyzed 3 not 4 bug
+       Fixed slapd/modify.c modtail freed twice bug
        Fixed slapd/value.c value_cmp bug
-       Fixed slapd/back-ldbm/cache.c delete_internal dntree/idtree bug
        Fixed slapd/tools DB2 uninitialized Datum bugs
+       Fixed slapd/back-ldbm/cache.c delete_internal dntree/idtree bug
        Fixed slapd/back-ldbm search realbase free bug (ITS#12)
        Fixed slapd/back-ldbm kerberos bind rc bug (ITS#17)
        Build environment (autoconf)

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 142fa8da99b25721dcc2ca9e54cbcdae32a76a9d..d3fb13a0a1c200ec67a0f77184634f9c8a0bf286 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -86,6 +86,7 @@ do_modify(
                        free( dn );
                        free( odn );
                        free( *modtail );
+                       *modtail = NULL;
                        modlist_free( mods );
                        return;
                }