ITS#6720

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)

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;