From 7c4061b81442ff5358319fba61cf920bf9169425 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 25 Oct 2005 17:51:56 +0000 Subject: [PATCH] 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 --- ChangeLog-gtk2.claws | 10 ++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/addrbook.c | 1 + src/addrindex.c | 1 + src/compose.c | 12 +++++++++--- src/procmime.c | 4 +++- 7 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 4ca1d8ede..9d7b02942 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index 78701c68d..5da942ae6 100644 --- 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.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 972c49f06..905413175 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=106 +EXTRA_VERSION=107 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addrbook.c b/src/addrbook.c index 694808c29..e0f8861d0 100644 --- 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); + g_free(element); if (uAttr) { if (person) { diff --git a/src/addrindex.c b/src/addrindex.c index 5bdbabcb1..2a8f4680a 100644 --- 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 ); } + g_free(element); xml_parse_next_tag(file); } } diff --git a/src/compose.c b/src/compose.c index 877034d33..98a0cadc3 100644 --- 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)) { + 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); - - 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; - + } + 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->privacy_system); + if (addressbook_get_target_compose() == compose) addressbook_set_target_compose(NULL); diff --git a/src/procmime.c b/src/procmime.c index 86fde5608..f281ebf12 100644 --- 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 == '\0') basetmp = g_strdup("mimetmp"); + if (*basetmp == '\0') + basetmp = g_strdup("mimetmp"); base = conv_filename_from_utf8(basetmp); + g_free(basetmp); subst_for_shellsafe_filename(base); } -- 2.25.1