2005-01-06 [colin] 0.9.13cvs27.4

	* src/prefs_matcher.c
		Fix double-free. Patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 1842ad101f1bdc4e5b11fc247b4a0197d561e49c..b1fb1a839dadf8f35dfb7ba2cef45be87838a31d 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-06 [colin]     0.9.13cvs27.4
+
+       * src/prefs_matcher.c
+               Fix double-free. Patch by Alfons
+
 2005-01-06 [colin]     0.9.13cvs27.3
 
        * src/prefs_matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index 1355928e1a86feed7078c8417c3e14471ad0058e..ec3364c029304d58ed8f691a1c8f43e9fafdbef0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -312,3 +312,4 @@
 ( cvs diff -u -r 1.207.2.23 -r 1.207.2.24 src/folderview.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/imap_gtk.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/news_gtk.c; ) > 0.9.13cvs27.1.patchset
 ( cvs diff -u -r 1.61.2.19 -r 1.61.2.20 src/account.c; cvs diff -u -r 1.27.2.7 -r 1.27.2.8 src/addr_compl.c; cvs diff -u -r 1.26.2.8 -r 1.26.2.9 src/foldersel.c; cvs diff -u -r 1.25.2.8 -r 1.25.2.9 src/stock_pixmap.c; cvs diff -u -r 1.18.2.5 -r 1.18.2.6 src/stock_pixmap.h; ) > 0.9.13cvs27.2.patchset
 ( cvs diff -u -r 1.43.2.11 -r 1.43.2.12 src/prefs_matcher.c; ) > 0.9.13cvs27.3.patchset
+( cvs diff -u -r 1.43.2.12 -r 1.43.2.13 src/prefs_matcher.c; ) > 0.9.13cvs27.4.patchset

diff --git a/configure.ac b/configure.ac
index 50d2038495da3c24b6761b3d3b0baf9a1534e202..7699f64dd5ad8f2fa21a6f6493cda025bb9b0261 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=27
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 2dc3c8a073c28614032746f5cb274f83a74d5485..32fab7287f8e7a61993e5c8a50cff710a882c219 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1602,8 +1602,8 @@ static void prefs_matcher_ok(void)
                                        val = alertpanel(_("Entry not saved"),
                                                         _("The entry was not saved\nHave you really finished?"),
                                                         _("Yes"), _("No"), NULL);
-                                       g_free(matcher_str);                                             
                                        if (G_ALERTDEFAULT != val) {
+                                               g_free(matcher_str);                                             
                                                g_free(str);
                                                return;
                                        }