aboutsummaryrefslogtreecommitdiffstats
path: root/em-format/e-mail-formatter-utils.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-03-07 02:37:37 +0800
committerMilan Crha <mcrha@redhat.com>2013-03-07 02:38:19 +0800
commit0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8 (patch)
tree16a25ce6707e5a61b86bedc3386e8412be764227 /em-format/e-mail-formatter-utils.c
parent989886007f3f69ca64e383ad6d64ef8c352f6df8 (diff)
downloadgsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar.gz
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar.bz2
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar.lz
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar.xz
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.tar.zst
gsoc2013-evolution-0d96f08f9f0400ab9202f1dcdbaca1d891a41ac8.zip
Bug #690092 - Crash under format_full_headers()
Diffstat (limited to 'em-format/e-mail-formatter-utils.c')
-rw-r--r--em-format/e-mail-formatter-utils.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index 5fdb885e9a..a2e0d43ff1 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -299,19 +299,21 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
struct _camel_header_address *addrs;
GString *html;
gchar *img;
- const gchar *charset;
+ gchar *charset;
- charset = e_mail_formatter_get_charset (formatter);
+ charset = e_mail_formatter_dup_charset (formatter);
if (charset == NULL)
- charset = e_mail_formatter_get_default_charset (formatter);
+ charset = e_mail_formatter_dup_default_charset (formatter);
buf = camel_header_unfold (header->value);
addrs = camel_header_address_decode (buf, charset);
if (addrs == NULL) {
+ g_free (charset);
g_free (buf);
return;
}
+ g_free (charset);
g_free (buf);
html = g_string_new ("");