From 31357665004adb9dfba27366bbe5df413aff8cb3 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 9 Jul 2004 13:57:54 +0000 Subject: Fix for bug #61199. 2004-07-07 Jeffrey Stedfast Fix for bug #61199. * em-format-html.c (efh_format_address): Same. * em-format-quote.c (emfq_format_address): Make sure 'real' isn't NULL before using. svn path=/trunk/; revision=26606 --- mail/em-format-quote.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mail/em-format-quote.c') diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index e25b182a31..dc5695cfc2 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -209,14 +209,17 @@ emfq_format_address (GString *out, struct _camel_header_address *a) case CAMEL_HEADER_ADDRESS_NAME: if (name && *name) { char *real, *mailaddr; - + g_string_append_printf (out, "%s <", name); /* rfc2368 for mailto syntax and url encoding extras */ - real = camel_header_encode_phrase (a->name); - mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr); - g_free (real); - mailto = camel_url_encode (mailaddr, "?=&()"); - g_free (mailaddr); + if ((real = camel_header_encode_phrase (a->name))) { + mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr); + g_free (real); + mailto = camel_url_encode (mailaddr, "?=&()"); + g_free (mailaddr); + } else { + mailto = camel_url_encode (a->v.addr, "?=&()"); + } } else { mailto = camel_url_encode (a->v.addr, "?=&()"); } -- cgit