From 76ee6f3e7fe18a6bc17276cbb58828d7834ccf80 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Jun 2011 18:25:12 +0200 Subject: Bug #653466 - Crash in efh_format_headers --- mail/em-format-html.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 5dd2440c5f..0e8d8d3df7 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2796,7 +2796,7 @@ efh_format_headers (EMFormatHTML *efh, /* If the header is collapsed, display just subject and sender in one row and leave */ if (efh->priv->headers_state == EM_FORMAT_HTML_HEADERS_STATE_COLLAPSED && efh->priv->headers_collapsable) { - gchar *subject = _("(no subject)"); + gchar *subject = NULL; struct _camel_header_address *addrs = NULL; GString *from = g_string_new (""); @@ -2817,6 +2817,7 @@ efh_format_headers (EMFormatHTML *efh, } else if (!g_ascii_strcasecmp (header->name, "Subject")) { gchar *buf = NULL; buf = camel_header_unfold (header->value); + g_free (subject); subject = camel_header_decode_string (buf, hdr_charset); g_free (buf); } @@ -2824,10 +2825,9 @@ efh_format_headers (EMFormatHTML *efh, } camel_stream_printf (stream, "%s %s%s%s", - evolution_imagesdir, subject, from->len ? "(" : "", from->str, from->len ? ")" : ""); + evolution_imagesdir, subject ? subject : _("(no subject)"), from->len ? "(" : "", from->str, from->len ? ")" : ""); g_free (subject); - g_free (header); if (addrs) camel_header_address_list_clear (&addrs); g_string_free (from, TRUE); -- cgit v1.2.3