import fix for searchFilter double free (ITS#5043)

diff --git a/CHANGES b/CHANGES
index 719f1848e8aae05dcb508766e038534e18466023..49a88e48fe0529255504f7174b0a366da85f1681 100644 (file)
--- 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 5728afd8811982ed4a72cf804942b637c547e800..36d8165ee3dd15ec2d3955fb5b53aaab67dee9b9 100644 (file)
--- 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;