2007-08-20 [colin] 2.10.0cvs137

	* src/ldapctrl.c
		Fix a leak

diff --git a/ChangeLog b/ChangeLog
index f74e6edca63899713689cbd07fe0277a135b5e71..025b87d30dbca54be54758b56f0354406639cc28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-20 [colin]     2.10.0cvs137
+
+       * src/ldapctrl.c
+               Fix a leak
+
 2007-08-20 [paul]      2.10.0cvs136
 
        * src/browseldap.c

diff --git a/PATCHSETS b/PATCHSETS
index f613ccb1ed0f052d0b51c643084b01044a83ce0f..b695c573b146332d9374385792409281a16bea7e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2791,3 +2791,4 @@
 ( cvs diff -u -r 1.179.2.181 -r 1.179.2.182 src/imap.c;  ) > 2.10.0cvs134.patchset
 ( cvs diff -u -r 1.179.2.182 -r 1.179.2.183 src/imap.c;  ) > 2.10.0cvs135.patchset
 ( cvs diff -u -r 1.2.4.17 -r 1.2.4.18 src/browseldap.c;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/editldap.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/ldapctrl.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/ldapquery.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapquery.h;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapserver.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/ldaputil.c;  ) > 2.10.0cvs136.patchset
+( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/ldapctrl.c;  ) > 2.10.0cvs137.patchset

diff --git a/configure.ac b/configure.ac
index a9decff6b6b1170c7c4c8333f931c87340c93437..220cf4c80dd366e249af250c57c7b92c7d48ee05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=136
+EXTRA_VERSION=137
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index 11b38b81efd2f34005f2dc9996963d01f1cfdf18..4cfc74c078408bc60e4a0bde4d2af33608d6a664 100644 (file)
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -526,7 +526,6 @@ gchar *ldapctl_format_criteria( LdapControl *ctl, const gchar *searchVal ) {
        node = ctl->listCriteria;
        while( node ) {
                gchar *attr, *tmp;
-
                attr = node->data;
                node = g_list_next( node );
 
@@ -664,11 +663,13 @@ void ldapctl_parse_ldap_search( LdapControl *ctl, gchar *criteria ) {
  * \return Formatted string or <i>""</i>. Should be g_free() when done.
  */
 gchar *ldapctl_get_default_criteria() {
-       gchar *retVal = LDAPCTL_DFL_ATTR_LIST;
+       gchar *retVal = g_strdup(LDAPCTL_DFL_ATTR_LIST);
        const gchar **attrs = ATTRIBUTE; 
 
        while (*attrs) {
-               retVal = g_strdup_printf("%s, %s", retVal, *attrs++);
+               gchar *tmp = g_strdup_printf("%s, %s", retVal, *attrs++);
+               g_free(retVal);
+               retVal = tmp;
        }
        debug_print("default search criteria: %s\n", retVal);
        return retVal;