debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/reply: fix two memory leaks, document a third

Browse source 
internet_address_list_to_string returns an allocated string, which
needs to be freed with g_free. g_free can handle a NULL argument, so
we follow the usage elsewhere of calling it unconditionally.

The third leak we leave as it would require restructuring of
add_recipients_from_message, and is fixed by later gmime-3.0 porting.
This commit is contained in:
David Bremner 2017-05-27 13:51:15 -03:00
parent e86fa3226c
commit 233092577c
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
notmuch-reply.c
View file

@ -45,7 +45,7 @@ format_part_reply (GMimeStream *stream, mime_node_t *node)
} else if (GMIME_IS_MESSAGE (node->part)) { } else if (GMIME_IS_MESSAGE (node->part)) {
GMimeMessage *message = GMIME_MESSAGE (node->part); GMimeMessage *message = GMIME_MESSAGE (node->part);
InternetAddressList *recipients; InternetAddressList *recipients;
const char *recipients_string; char *recipients_string;
g_mime_stream_printf (stream, "> From: %s\n", g_mime_message_get_sender (message)); g_mime_stream_printf (stream, "> From: %s\n", g_mime_message_get_sender (message));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
@ -53,11 +53,13 @@ format_part_reply (GMimeStream *stream, mime_node_t *node)
if (recipients_string) if (recipients_string)
g_mime_stream_printf (stream, "> To: %s\n", g_mime_stream_printf (stream, "> To: %s\n",
recipients_string); recipients_string);
g_free (recipients_string);
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
g_mime_stream_printf (stream, "> Cc: %s\n", g_mime_stream_printf (stream, "> Cc: %s\n",
recipients_string); recipients_string);
g_free (recipients_string);
g_mime_stream_printf (stream, "> Subject: %s\n", g_mime_message_get_subject (message)); g_mime_stream_printf (stream, "> Subject: %s\n", g_mime_message_get_subject (message));
g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_as_string (message)); g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_as_string (message));
g_mime_stream_printf (stream, ">\n"); g_mime_stream_printf (stream, ">\n");
@ -329,6 +331,12 @@ add_recipients_from_message (GMimeMessage *reply,
GMimeMessage *message, GMimeMessage *message,
notmuch_bool_t reply_all) notmuch_bool_t reply_all)
{ {
/* There is a memory leak here with gmime-2.6 because get_sender
* returns a newly allocated list, while the others return
* references to libgmime owned data. This leak will be fixed with
* the transition to gmime-3.0.
*/
struct { struct {
InternetAddressList * (*get_header)(GMimeMessage *message); InternetAddressList * (*get_header)(GMimeMessage *message);
GMimeRecipientType recipient_type; GMimeRecipientType recipient_type;