2004-11-23 [colin] 0.9.12cvs158.9

	* src/compose.c
		Fix double-free when forwarding
	* src/msgcache.c
		Fix leak on error path

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index de7b204421c3f816143eae5883860446c2b13ccf..93c2b75fdd0ae3cac20ea78c00139d6c30e68eec 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2004-11-23 [colin]     0.9.12cvs158.9
+
+       * src/compose.c
+               Fix double-free when forwarding
+       * src/msgcache.c
+               Fix leak on error path
+               
+
 2004-11-23 [colin]     0.9.12cvs158.8
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0b412b4834ff022999601dabf7cfc0c4b4c98d7c..ac89bd3da997ce266c6c674866b6c3e867fa2866 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -254,3 +254,4 @@
 ( cvs diff -u -r 1.382.2.70 -r 1.382.2.71 src/compose.c; ) > 0.9.12cvs158.6.patchset
 ( cvs diff -u -r 1.382.2.71 -r 1.382.2.72 src/compose.c; ) > 0.9.12cvs158.7.patchset
 ( cvs diff -u -r 1.382.2.72 -r 1.382.2.73 src/compose.c; ) > 0.9.12cvs158.8.patchset
+( cvs diff -u -r 1.382.2.73 -r 1.382.2.74 src/compose.c; cvs diff -u -r 1.16.2.9 -r 1.16.2.10 src/msgcache.c; ) > 0.9.12cvs158.9.patchset

diff --git a/configure.ac b/configure.ac
index f96dc3117b410f6e5fb7365f4db57eb40fdb854c..152d4f4cbfec832ef110c61daee24abf89ed47e6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=158
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.8
+EXTRA_GTK2_VERSION=.9
 
 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/compose.c b/src/compose.c
index 7e9fe88d1caa5f5fd03efc729fed51c86b3f1c4e..c00aef4e90045ac0c148dbaa058063235d47633f 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2220,7 +2220,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
 
                        msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
                        if (msginfo && msginfo->subject)
-                               name = msginfo->subject;
+                               name = g_strdup(msginfo->subject);
                        else
                                name = g_path_get_basename(filename ? filename : file);
 

diff --git a/src/msgcache.c b/src/msgcache.c
index 89b0c675234e0896b35c1a863bfbb3f1abb88abb..b4d8ef47102a585ff8beaf8a249ad46ed7a9adb0 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -487,17 +487,17 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
        fclose(fp);
        g_hash_table_thaw(cache->msgnum_table);
 
-       if(error) {
-               msgcache_destroy(cache);
-               return NULL;
-       }
-
        if (conv != NULL) {
                if (conv->free != NULL)
                        conv->free(conv);
                g_free(conv);
        }
 
+       if(error) {
+               msgcache_destroy(cache);
+               return NULL;
+       }
+
        cache->last_access = time(NULL);
 
        debug_print("done. (%d items read)\n", g_hash_table_size(cache->msgnum_table));