ITS#6720

diff --git a/CHANGES b/CHANGES
index e37d06fdea3e797754355292766c6489acd4024a..c2c032563d7a6848bb718357327f312c6f15ad64 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -53,6 +53,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapo-ppolicy to allow userPassword deletion (ITS#6620)
        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-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 54e58464c7b4e3e77ad47d0921fa7cedabe95001..a0fd0316feea6a539e1824460b0f385bb37d4f93 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -598,7 +598,7 @@ rwm_op_modify( Operation *op, SlapReply *rs )
                                        &mapping, RWM_MAP );
                        if ( drop_missing || ( mapping != NULL && BER_BVISNULL( &mapping->m_dst ) ) )
                        {
-                               goto cleanup_mod;
+                               goto skip_mod;
                        }
                }
 
@@ -693,6 +693,10 @@ next_mod:;
                mlp = &ml->sml_next;
                continue;
 
+skip_mod:;
+               *mlp = (*mlp)->sml_next;
+               continue;
+
 cleanup_mod:;
                ml = *mlp;
                *mlp = (*mlp)->sml_next;