From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 19 Apr 2010 21:32:31 +0000 (+0000)
Subject: ITS#6526
X-Git-Tag: OPENLDAP_REL_ENG_2_4_22~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ec116d403403937817b36bb376d4876b39d3fbf2;p=openldap

ITS#6526
---

diff --git a/CHANGES b/CHANGES
index 07879f8873..f754512930 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ OpenLDAP 2.4.22 Engineering
 	Fixed slapo-pcache to release its own entries (ITS#6484)
 	Fixed slapo-pcache with NULL backend (ITS#6490)
 	Fixed slapo-rwm entry release handling (ITS#6484)
+	Fixed slapo-rwm memory handling with rewrites (ITS#6526)
 	Fixed slapo-rwm olcRwmMap handling (ITS#6436)
 	Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-syncprov memory leak (ITS#6459)
diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 603275ff70..1c1acc819b 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -2114,7 +2114,6 @@ rwm_cf_gen( ConfigArgs *c )
 		switch ( c->type ) {
 		case RWM_CF_REWRITE:
 			if ( c->valx >= 0 ) {
-				ConfigArgs ca = { 0 };
 				int i;
 
 				for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
@@ -2139,6 +2138,8 @@ rwm_cf_gen( ConfigArgs *c )
 
 				for ( i = 0; !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
 				{
+					ConfigArgs ca = { 0 };
+
 					ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
 					ca.argc = 0;
 					config_fp_parse_line( &ca );
@@ -2282,7 +2283,6 @@ rwm_cf_gen( ConfigArgs *c )
 	case RWM_CF_REWRITE:
 		if ( c->valx >= 0 ) {
 			struct rewrite_info *rwm_rw = rwmap->rwm_rw;
-			ConfigArgs ca = { 0 };
 			int i, last;
 
 			for ( last = 0; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ last ] ); last++ )
@@ -2296,6 +2296,8 @@ rwm_cf_gen( ConfigArgs *c )
 			rc = rwm_info_init( &rwmap->rwm_rw );
 
 			for ( i = 0; i < c->valx; i++ ) {
+				ConfigArgs ca = { 0 };
+
 				ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
 				ca.argc = 0;
 				config_fp_parse_line( &ca );
@@ -2344,6 +2346,8 @@ rwm_cf_gen( ConfigArgs *c )
 
 			for ( i = c->valx; rwmap->rwm_bva_rewrite && !BER_BVISNULL( &rwmap->rwm_bva_rewrite[ i ] ); i++ )
 			{
+				ConfigArgs ca = { 0 };
+
 				ca.line = rwmap->rwm_bva_rewrite[ i ].bv_val;
 				ca.argc = 0;
 				config_fp_parse_line( &ca );