From: Colin Leroy <colin@colino.net>
Date: Mon, 20 Aug 2007 20:53:39 +0000 (+0000)
Subject: 2007-08-20 [colin]	2.10.0cvs137
X-Git-Tag: rel_3_0_0~56
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=955f05300f78ffcb4dce4283aa0f1fdc2f17e8d5;hp=c5d060ad69935e5fe5e35aa5754dec2d0b00d5a1

2007-08-20 [colin]	2.10.0cvs137

	* src/ldapctrl.c
		Fix a leak
---

diff --git a/ChangeLog b/ChangeLog
index f74e6edca..025b87d30 100644
--- 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 f613ccb1e..b695c573b 100644
--- 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 a9decff6b..220cf4c80 100644
--- 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 11b38b81e..4cfc74c07 100644
--- 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;