cli/show: fix some memory leaks in format_part_text

Mimic Jeff Stedfast's changes to format_headers_sprinter, clean up use
of internet_address_list_to_string and
g_mime_message_get_date_as_string.
This commit is contained in:
David Bremner 2017-03-18 14:07:45 -03:00
parent 195361c8cd
commit 2ae6b8cb68

View file

@ -502,7 +502,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
if (GMIME_IS_MESSAGE (node->part)) { 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;
char *date_string;
printf ("\fheader{\n"); printf ("\fheader{\n");
if (node->envelope_file) if (node->envelope_file)
@ -513,11 +514,15 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
printf ("To: %s\n", recipients_string); printf ("To: %s\n", 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)
printf ("Cc: %s\n", recipients_string); printf ("Cc: %s\n", recipients_string);
printf ("Date: %s\n", g_mime_message_get_date_as_string (message)); g_free (recipients_string);
date_string = g_mime_message_get_date_as_string (message);
printf ("Date: %s\n", date_string);
g_free (date_string);
printf ("\fheader}\n"); printf ("\fheader}\n");
printf ("\fbody{\n"); printf ("\fbody{\n");