From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 12 Jul 2007 22:23:48 +0000 (+0000)
Subject: import fix for searchFilter double free (ITS#5043)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_37~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669d02118171c532053644f06742b8051cd59582;p=thirdparty%2Fopenldap.git

import fix for searchFilter double free (ITS#5043)
---

diff --git a/CHANGES b/CHANGES
index 719f1848e8..49a88e48fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.37 Engineering
 	Fixed slapd-glue/syncprov interaction (ITS#4623)
 	Fixed slapd-ldap search reference crash (ITS#5025)
+	Fixed slapo-rwm searchFilter double free (ITS#5043)
 	Clarified slapd-perl SampleLDAP.pm usage (ITS#4995)
 	Documentation
 		Fixed slapd.conf(5) for default loglevel (ITS#5027)
diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index 5728afd881..36d8165ee3 100644
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -768,7 +768,9 @@ rwm_filter_map_rewrite(
 	case REWRITE_REGEXEC_OK:
 		if ( !BER_BVISNULL( fstr ) ) {
 			fstr->bv_len = strlen( fstr->bv_val );
-			ch_free( ftmp.bv_val );
+			if ( fstr->bv_val != ftmp.bv_val ) {
+				ch_free( ftmp.bv_val );
+			}
 
 		} else {
 			*fstr = ftmp;