diff options
| author | David Bremner <david@tethera.net> | 2017-05-27 13:51:15 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-05-30 09:02:29 -0300 |
| commit | 233092577cdcb86e3e38374a50a3a26c05474126 (patch) | |
| tree | b5167aa53eec49e0e53fa6e879211fdb22808e91 | |
| parent | e86fa3226cbd3c28106828f079a9c0d5d27299b8 (diff) | |
cli/reply: fix two memory leaks, document a third
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.
| -rw-r--r-- | notmuch-reply.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/notmuch-reply.c b/notmuch-reply.c index 9239aac2..b88f1d31 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -45,7 +45,7 @@ format_part_reply (GMimeStream *stream, mime_node_t *node) } else if (GMIME_IS_MESSAGE (node->part)) { GMimeMessage *message = GMIME_MESSAGE (node->part); InternetAddressList *recipients; - const char *recipients_string; + char *recipients_string; 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); @@ -53,11 +53,13 @@ format_part_reply (GMimeStream *stream, mime_node_t *node) if (recipients_string) g_mime_stream_printf (stream, "> To: %s\n", recipients_string); + g_free (recipients_string); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); recipients_string = internet_address_list_to_string (recipients, 0); if (recipients_string) g_mime_stream_printf (stream, "> Cc: %s\n", 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, "> Date: %s\n", g_mime_message_get_date_as_string (message)); g_mime_stream_printf (stream, ">\n"); @@ -329,6 +331,12 @@ add_recipients_from_message (GMimeMessage *reply, GMimeMessage *message, 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 { InternetAddressList * (*get_header)(GMimeMessage *message); GMimeRecipientType recipient_type; |