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

cli/show: fix usage of g_mime_content_type_to_string

Browse source 
It returns an "allocated string", which needs to be freed.
This commit is contained in:
David Bremner 2017-03-18 14:33:50 -03:00
parent 2ae6b8cb68
commit b4cedc7824
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
notmuch-show.c
View file

@ -480,6 +480,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_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0,
notmuch_message_get_filename (message)); notmuch_message_get_filename (message));
} else { } else {
char *content_string;
const char *disposition = _get_disposition (meta); const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta); const char *cid = g_mime_object_get_content_id (meta);
const char *filename = leaf ? const char *filename = leaf ?
@ -496,7 +497,10 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
printf (", Filename: %s", filename); printf (", Filename: %s", filename);
if (cid) if (cid)
printf (", Content-id: %s", 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)) { if (GMIME_IS_MESSAGE (node->part)) {
@ -537,8 +541,9 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
show_text_part_content (node->part, stream_stdout, 0); show_text_part_content (node->part, stream_stdout, 0);
g_object_unref(stream_stdout); g_object_unref(stream_stdout);
} else { } else {
printf ("Non-text part: %s\n", char *content_string = g_mime_content_type_to_string (content_type);
g_mime_content_type_to_string (content_type)); printf ("Non-text part: %s\n", content_string);
g_free (content_string);
} }
} }
@ -606,6 +611,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
GMimeObject *meta = node->envelope_part ? GMimeObject *meta = node->envelope_part ?
GMIME_OBJECT (node->envelope_part) : node->part; GMIME_OBJECT (node->envelope_part) : node->part;
GMimeContentType *content_type = g_mime_object_get_content_type (meta); GMimeContentType *content_type = g_mime_object_get_content_type (meta);
char *content_string;
const char *disposition = _get_disposition (meta); const char *disposition = _get_disposition (meta);
const char *cid = g_mime_object_get_content_id (meta); const char *cid = g_mime_object_get_content_id (meta);
const char *filename = GMIME_IS_PART (node->part) ? const char *filename = GMIME_IS_PART (node->part) ?
@ -634,7 +640,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
} }
sp->map_key (sp, "content-type"); 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) { if (disposition) {
sp->map_key (sp, "content-disposition"); sp->map_key (sp, "content-disposition");