From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 5/6] cli/show: fix usage of g_mime_content_type_to_string
Date: Sat, 18 Mar 2017 14:50:37 -0300 [thread overview]
Message-ID: <20170318175038.15887-6-david@tethera.net> (raw)
In-Reply-To: <20170318175038.15887-1-david@tethera.net>
It returns an "allocated string", which needs to be freed.
---
notmuch-show.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index b0afc29e..43ee9021 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -438,6 +438,7 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0,
notmuch_message_get_filename (message));
} else {
+ char *content_string;
const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta);
const char *filename = leaf ?
@@ -454,7 +455,10 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
printf (", Filename: %s", filename);
if (cid)
printf (", Content-id: %s", cid);
- printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
+
+ content_string = g_mime_content_type_to_string (content_type);
+ printf (", Content-type: %s\n", content_string);
+ g_free (content_string);
}
if (GMIME_IS_MESSAGE (node->part)) {
@@ -495,8 +499,9 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
show_text_part_content (node->part, stream_stdout, 0);
g_object_unref(stream_stdout);
} else {
- printf ("Non-text part: %s\n",
- g_mime_content_type_to_string (content_type));
+ char *content_string = g_mime_content_type_to_string (content_type);
+ printf ("Non-text part: %s\n", content_string);
+ g_free (content_string);
}
}
@@ -564,6 +569,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
GMimeObject *meta = node->envelope_part ?
GMIME_OBJECT (node->envelope_part) : node->part;
GMimeContentType *content_type = g_mime_object_get_content_type (meta);
+ char *content_string;
const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta);
const char *filename = GMIME_IS_PART (node->part) ?
@@ -592,7 +598,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
}
sp->map_key (sp, "content-type");
- sp->string (sp, g_mime_content_type_to_string (content_type));
+ content_string = g_mime_content_type_to_string (content_type);
+ sp->string (sp, content_string);
+ g_free (content_string);
if (disposition) {
sp->map_key (sp, "content-disposition");
--
2.11.0
next prev parent reply other threads:[~2017-03-18 17:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-18 17:50 memory leak cleanup for notmuch show David Bremner
2017-03-18 17:50 ` [PATCH 1/6] perf-test: use 'eval' in memory_run David Bremner
2017-03-18 21:04 ` Tomi Ollila
2017-03-18 17:50 ` [PATCH 2/6] perf-test: add simple memory tests for notmuch-show David Bremner
2017-03-18 17:50 ` [PATCH 3/6] fix memory leaks in notmuch-show.c:format_headers_sprinter() David Bremner
2017-03-18 17:50 ` [PATCH 4/6] cli/show: fix some memory leaks in format_part_text David Bremner
2017-03-18 17:50 ` David Bremner [this message]
2017-03-18 17:50 ` [PATCH 6/6] cli/show: unref crlf filter David Bremner
2017-03-18 20:03 ` [PATCH] perf-test/mem: add simple memory tests for notmuch search David Bremner
2017-03-18 21:11 ` memory leak cleanup for notmuch show Tomi Ollila
2017-03-19 0:14 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170318175038.15887-6-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).