From 08d304d5cf83390f81a48897dfe5d4bd634a3b7d Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 10 Jul 2008 02:07:08 +0000 Subject: [PATCH] ITS#5589 --- CHANGES | 1 + servers/slapd/overlays/syncprov.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 9e3551c61a..3faba529d7 100644 --- 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 80fd2774c2..0bb3180061 100644 --- 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 ); } -- 2.39.5