From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 8 Jul 2008 22:36:58 +0000 (+0000)
Subject: ITS#5557
X-Git-Tag: OPENLDAP_REL_ENG_2_4_11~57
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2e4d8136b598edd5c3e1533b56e73c9a483ff5db;p=openldap

ITS#5557
---

diff --git a/CHANGES b/CHANGES
index c48ee354a6..450b008bf6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.11 Engineering
+	Fixed slapd sets memory leak (ITS#5557)
 	Added slapo-nssov contrib module
 	Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
 	Fixed slapo-syncprov ACL evaluation (ITS#5548)
diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index d7c56fa9ed..d8de70044d 100644
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -200,6 +200,7 @@ slap_set_join(
 							cp->set_op->o_tmpfree( rset[ i ].bv_val, cp->set_op->o_tmpmemctx );
 							rset[ i ] = rset[ --rlast ];
 							BER_BVZERO( &rset[ rlast ] );
+							i--;
 						}
 						exists = 1;
 						break;