2008-11-27 [colin] 3.6.1cvs47

	* src/filtering.c
	* src/matcher.c
		Fix a little leak

diff --git a/ChangeLog b/ChangeLog
index 3750ab1304153e3eff4215804afbcf4fa4ce17a2..1cdb9232bff98cbc035f40081522a03339cdca29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-27 [colin]     3.6.1cvs47
+
+       * src/filtering.c
+       * src/matcher.c
+               Fix a little leak
+
 2008-11-26 [colin]     3.6.1cvs46
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index cc1fc8a744bc3a7a0b526e9242a08f75a1e5c3a6..b6d6cec0ec26e279dbce1e4781fbc32016c264d6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3628,3 +3628,4 @@
 ( cvs diff -u -r 1.115.2.215 -r 1.115.2.216 src/main.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/claws.c;  cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/common/ssl.c;  ) > 3.6.1cvs44.patchset
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs45.patchset
 ( cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/common/ssl.c;  ) > 3.6.1cvs46.patchset
+( cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/filtering.c;  cvs diff -u -r 1.75.2.62 -r 1.75.2.63 src/matcher.c;  ) > 3.6.1cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 15ce18cff2cbb7f1c8fed63e506ef72b209a3810..e21aeee00d5c31543f18a721ace713dd7acaac95 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index ab1b585eeed49fa640cc99ff42f905786e891f51..c8ffe7f855e864c9505001b244b1069445d98e1d 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -174,6 +174,7 @@ void filteringprop_free(FilteringProp * prop)
         for (tmp = prop->action_list ; tmp != NULL ; tmp = tmp->next) {
                 filteringaction_free(tmp->data);
         }
+       g_slist_free(prop->action_list);
        g_free(prop->name);
        g_free(prop);
 }

diff --git a/src/matcher.c b/src/matcher.c
index f4945af18b759c2696fb7a66007aa8c07f49935c..6ae1c0df2802f319e4bdcbb973f8a06ae7b81c89 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1210,6 +1210,7 @@ void matcherlist_free(MatcherList *cond)
        for (l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
                matcherprop_free((MatcherProp *) l->data);
        }
+       g_slist_free(cond->matchers);
        g_free(cond);
 }