diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-mime-filter-charset.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index b089b22def..6a875f547b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2003-04-09 Jeffrey Stedfast <fejj@ximian.com> + + * camel-mime-filter-charset.c + (camel_mime_filter_charset_new_convert): NULL-protect the to/from + charsets in the g_warning call. + 2003-04-08 Jeffrey Stedfast <fejj@ximian.com> Fixes for bug #40778. Probably others as well. diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index 6d5bb4f000..012f1897be 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -263,7 +263,9 @@ camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_ new->ic = e_iconv_open (to_charset, from_charset); if (new->ic == (iconv_t) -1) { g_warning ("Cannot create charset conversion from %s to %s: %s", - from_charset, to_charset, g_strerror (errno)); + from_charset ? from_charset : "(null)", + to_charset ? to_charset : "(null)", + g_strerror (errno)); camel_object_unref (new); new = NULL; } else { |