2005-10-25 [colin] 1.9.15cvs107

	* src/addrbook.c
	* src/addrindex.c
		Fix leak (xml_get_element() allocates memory)
	* src/compose.c
		Fix leak + dead code (shame!)
	* src/procmime.c
		Fix leak

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4ca1d8edeac18dcded92302ac06920ceab85bef4..9d7b02942f7eccfd99fdd69946d5acd33a5238a8 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,13 @@
+2005-10-25 [colin]     1.9.15cvs107
+
+       * src/addrbook.c
+       * src/addrindex.c
+               Fix leak (xml_get_element() allocates memory)
+       * src/compose.c
+               Fix leak + dead code (shame!)
+       * src/procmime.c
+               Fix leak
+

 2005-10-25 [colin]     1.9.15cvs106
 
        * src/mimeview.c
 2005-10-25 [colin]     1.9.15cvs106
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 78701c68d98c7cf943970893ac5a71f4051c974d..5da942ae673bc0b05e5133e58c742589b8b05515 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -943,3 +943,4 @@
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/wizard.c;  ) > 1.9.15cvs104.patchset
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset
 ( cvs diff -u -r 1.83.2.49 -r 1.83.2.50 src/mimeview.c;  ) > 1.9.15cvs106.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/wizard.c;  ) > 1.9.15cvs104.patchset
 ( cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.c;  ) > 1.9.15cvs105.patchset
 ( cvs diff -u -r 1.83.2.49 -r 1.83.2.50 src/mimeview.c;  ) > 1.9.15cvs106.patchset

+( cvs diff -u -r 1.22.2.5 -r 1.22.2.6 src/addrbook.c;  cvs diff -u -r 1.28.2.11 -r 1.28.2.12 src/addrindex.c;  cvs diff -u -r 1.382.2.188 -r 1.382.2.189 src/compose.c;  cvs diff -u -r 1.49.2.64 -r 1.49.2.65 src/procmime.c;  ) > 1.9.15cvs107.patchset

diff --git a/configure.ac b/configure.ac
index 972c49f0688cac0755cfb9e92d779f353ac235e9..905413175a9f360bb2c689ac86c86ad47c9afe58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=106
+EXTRA_VERSION=107

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrbook.c b/src/addrbook.c
index 694808c29c0728c25c9e7b9e6e833e0cb08ca62f..e0f8861d0ff1678e401b04d831e5c7d7948f9d89 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -508,6 +508,7 @@ static void addrbook_parse_attribute(XMLFile *file, ItemPerson *person)
 
        element = xml_get_element(file);
        addritem_attrib_set_value(uAttr, element);
 
        element = xml_get_element(file);
        addritem_attrib_set_value(uAttr, element);

+       g_free(element);

 
        if (uAttr) {
                if (person) {
 
        if (uAttr) {
                if (person) {

diff --git a/src/addrindex.c b/src/addrindex.c
index 5bdbabcb11f7867c3f3d6d256e246c281bb371e0..2a8f4680a41f5203ecb7b85c413ddffe2cf1090c 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1852,6 +1852,7 @@ static AddressCvtNode *addrindex_parse_item( XMLFile *file ) {
                if( xml_compare_tag( file, ELTAG_IF_OLD_REMARKS ) ) {
                        nn->remarks = g_strdup( element );
                }
                if( xml_compare_tag( file, ELTAG_IF_OLD_REMARKS ) ) {
                        nn->remarks = g_strdup( element );
                }

+               g_free(element);

                xml_parse_next_tag(file);
        }
 }
                xml_parse_next_tag(file);
        }
 }

diff --git a/src/compose.c b/src/compose.c
index 877034d33793e6ebb00c7a00ada38722d24c665c..98a0cadc3a742b655d05ed1a6c76024c4ed266b0 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1437,15 +1437,18 @@ static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbu
        /* check sig separator */
        if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
                        compose->account->sig_sep)) {
        /* check sig separator */
        if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
                        compose->account->sig_sep)) {

+               gchar *tmp = NULL;

                /* check end of line (\n) */
                gtk_text_buffer_get_iter_at_offset(textbuf, &start,
                        start_pos+strlen(compose->account->sig_sep));
                gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
                        start_pos+strlen(compose->account->sig_sep)+1);
                /* check end of line (\n) */
                gtk_text_buffer_get_iter_at_offset(textbuf, &start,
                        start_pos+strlen(compose->account->sig_sep));
                gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
                        start_pos+strlen(compose->account->sig_sep)+1);

-
-               if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),"\n"));
+               tmp = gtk_text_iter_get_text(&start, &end_iter);
+               if (!strcmp(tmp,"\n")) {
+                       g_free(tmp);

                        return TRUE;
                        return TRUE;

-               
+               }
+               g_free(tmp);    

 
        }
 
 
        }
 


@@ -5991,6 +5994,9 @@ static void compose_destroy(Compose *compose)
        g_free(compose->exteditor_file);
 
        g_free(compose->orig_charset);
        g_free(compose->exteditor_file);
 
        g_free(compose->orig_charset);

+
+       g_free(compose->privacy_system);
+

        if (addressbook_get_target_compose() == compose)
                addressbook_set_target_compose(NULL);
 
        if (addressbook_get_target_compose() == compose)
                addressbook_set_target_compose(NULL);
 

diff --git a/src/procmime.c b/src/procmime.c
index 86fde560894c0d2eeaa563e0852d714c8a44fa21..f281ebf1209c531dd1d7d1193526f597066d8f8b 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -980,8 +980,10 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                basetmp = g_path_get_basename(basetmp);
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                basetmp = g_path_get_basename(basetmp);

-               if (*basetmp == '\0') basetmp = g_strdup("mimetmp");
+               if (*basetmp == '\0') 
+                       basetmp = g_strdup("mimetmp");

                base = conv_filename_from_utf8(basetmp);
                base = conv_filename_from_utf8(basetmp);

+               g_free(basetmp);

                subst_for_shellsafe_filename(base);
        }
 
                subst_for_shellsafe_filename(base);
        }