import fix memory leak from HEAD (ITS#3669)

diff --git a/CHANGES b/CHANGES
index dd121b049acfd625841f008d3b34a844e6d7d33d..95097e77c6fa3acb4646f28dd3a3e55912fade79 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
 OpenLDAP 2.2 Change Log
 
-OpenLDAP 2.2.24 Engineering
+OpenLDAP 2.2.25 Engineering
        Fixed back-bdb ctxcsn/LRU bug (ITS#3666)
+       Fixed back-meta memory leak (ITS#3669)
 
 OpenLDAP 2.2.24 Release
        Fixed slapd "chldren:" typo (ITS#3560)

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 1467ada56f52b36b836e407a2119c1501a60c9f4..77c63189f5e32ec576e955181087a0e7497fe368 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -727,6 +727,9 @@ meta_send_entry(
                attr = ent.e_attrs;
                ent.e_attrs = attr->a_next;
                if ( attr->a_vals != &dummy ) {
+                       if ( attr->a_nvals != attr->a_vals ) {
+                               ber_bvarray_free( attr->a_nvals );
+                       }
                        ber_bvarray_free( attr->a_vals );
                }
                free( attr );