Fixed a few memory leaks in LDAP search results handling.

diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index d830279cda0c2abb5d858b7a0fb65b910ecdd844..62adf5b043b8703a4a0c2b8438775d3564092f03 100644 (file)
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -629,15 +629,18 @@ char **ldapctl_full_attribute_array( LdapControl *ctl ) {
        }
 
        def = ldapctl_get_default_criteria_list();
        }
 
        def = ldapctl_get_default_criteria_list();

+       node = def;

        
        

-       while (def) {
+       while (node) {

                if( g_list_find_custom(tmp, (gpointer)def->data, 
                                (GCompareFunc)strcmp2) == NULL) {
                if( g_list_find_custom(tmp, (gpointer)def->data, 
                                (GCompareFunc)strcmp2) == NULL) {

-                       tmp = g_list_append(tmp, g_strdup(def->data));
+                       tmp = g_list_append(tmp, g_strdup(node->data));

                }
                }

-               def = def->next;
+               node = node->next;

        }
 
        }
 

+       g_list_free_full(def, g_free);
+

        node = tmp;
        cnt = g_list_length( tmp );
        ptrArray = g_new0( char *, 1 + cnt);
        node = tmp;
        cnt = g_list_length( tmp );
        ptrArray = g_new0( char *, 1 + cnt);


@@ -660,6 +663,7 @@ void ldapctl_free_attribute_array( char **ptrArray ) {
 
        /* Clear array to NULL's */
        for( i = 0; ptrArray[i] != NULL; i++ ) {
 
        /* Clear array to NULL's */
        for( i = 0; ptrArray[i] != NULL; i++ ) {

+               g_free(ptrArray[i]);

                ptrArray[i] = NULL;
        }
        g_free( ptrArray );
                ptrArray[i] = NULL;
        }
        g_free( ptrArray );


@@ -747,8 +751,7 @@ GList *ldapctl_get_default_criteria_list() {
                else
                        item = g_strdup(criteria);
                debug_print("adding attribute to list: %s\n", item);
                else
                        item = g_strdup(criteria);
                debug_print("adding attribute to list: %s\n", item);

-               attr_list = g_list_append(attr_list, g_strdup(item));
-               g_free(item);
+               attr_list = g_list_append(attr_list, item);

        }
        g_strfreev(c_list);
        return attr_list;
        }
        g_strfreev(c_list);
        return attr_list;