From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 16:09:44 +0000 (+0000)
Subject: ITS#6720
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4bedded48b995b1f2c8f15f7f5223449a1a4fb28;p=openldap

ITS#6720
---

diff --git a/CHANGES b/CHANGES
index e37d06fdea..c2c032563d 100644
--- 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 54e58464c7..a0fd0316fe 100644
--- 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;