ITS#6632

diff --git a/CHANGES b/CHANGES
index c2c032563d7a6848bb718357327f312c6f15ad64..8a1d917711c0d0659487872c8e9c34e17c89b5fc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -54,6 +54,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapo-refint when last group member is deleted (ITS#6663)
        Fixed slapo-refint with subtree rename (ITS#6730)
        Fixed slapo-rwm double free (ITS#6720)
+       Fixed slapo-rwm crasher (ITS#6632)
        Fixed slapo-sssvlv initialization (ITS#6649)
        Fixed slapo-syncprov to send error if consumer is newer (ITS#6606)
        Fixed slapo-syncprov filter race condition (ITS#6708)

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index a0fd0316feea6a539e1824460b0f385bb37d4f93..4fe78e6e8b174ca38c0cbe10056c066738258965 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -174,7 +174,7 @@ rwm_op_cleanup( Operation *op, SlapReply *rs )
 static rwm_op_cb *
 rwm_callback_get( Operation *op, SlapReply *rs )
 {
-       rwm_op_cb       *roc = NULL;
+       rwm_op_cb       *roc;
 
        roc = op->o_tmpalloc( sizeof( struct rwm_op_cb ), op->o_tmpmemctx );
        roc->cb.sc_cleanup = rwm_op_cleanup;
@@ -184,9 +184,12 @@ rwm_callback_get( Operation *op, SlapReply *rs )
        roc->ros.r_tag = op->o_tag;
        roc->ros.ro_dn = op->o_req_dn;
        roc->ros.ro_ndn = op->o_req_ndn;
-       roc->ros.o_request = op->o_request;
        BER_BVZERO( &roc->ros.r_dn );
        BER_BVZERO( &roc->ros.r_ndn );
+       BER_BVZERO( &roc->ros.rx_dn );
+       BER_BVZERO( &roc->ros.rx_ndn );
+       roc->ros.mapped_attrs = NULL;
+       roc->ros.o_request = op->o_request;
 
        return roc;
 }