ITS#7588 plug memleak

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 49b4cf01b066072ff3dd7aab5ed7d754220a5e12..c6779dd3a7a9129df6024c02f86791a1f4849e1c 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -397,7 +397,19 @@ static void free_sort_op( Connection *conn, sort_op *so )
 {
        int sess_id;
        if ( so->so_tree ) {
-               tavl_free( so->so_tree, ch_free );
+               if ( so->so_paged > SLAP_CONTROL_IGNORED ) {
+                       Avlnode *cur_node, *next_node;
+                       cur_node = so->so_tree;
+                       while ( cur_node ) {
+                               next_node = tavl_next( cur_node, TAVL_DIR_RIGHT );
+                               ch_free( cur_node->avl_data );
+                               ber_memfree( cur_node );
+
+                               cur_node = next_node;
+                       }
+               } else {
+                       tavl_free( so->so_tree, ch_free );
+               }
                so->so_tree = NULL;
        }