ITS#5589

diff --git a/CHANGES b/CHANGES
index 9e3551c61a10568b10aa2c8640dfbf94da796216..3faba529d72dbc3246f9aa9380fe281c583ccf5a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ OpenLDAP 2.4.11 Engineering
        Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
        Fixed slapo-syncprov ACL evaluation (ITS#5548)
        Fixed slapo-syncprov full reload (ITS#5564)
+       Fixed slapo-syncprov crash with delcsn (ITS#5589)
        Fixed slapo-unique filter normalization (ITS#5581)
        Fixed contrib smbk5pwd terminator (ITS#5575)
        Build Environment

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 80fd2774c291d5a8f82efae4581a0beef63d4525..0bb3180061235317091660b50a02483f407e8336 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1577,14 +1577,16 @@ syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl,
                if ( delcsn[0].bv_len ) {
                        slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,
                                srs->sr_state.sid );
-               }
 
-               Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 );
+                       Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 );
+               }
 
                uuids[ndel].bv_val = NULL;
                syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET,
                        delcsn[0].bv_len ? &cookie : NULL, 0, uuids, 1 );
-               op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
+               if ( delcsn[0].bv_len ) {
+                       op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
+               }
        }
        op->o_tmpfree( uuids, op->o_tmpmemctx );
 }