aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-02-08 16:29:27 +0100
committerDan Williams <dcbw@redhat.com>2012-02-08 12:07:13 -0600
commit635fce193ff3a1dbbdee2abab9aa3ab121df25f0 (patch)
tree9cc9cd99a300f9419d06ff1d7fc0aa2362be595b
parent9ca3cfff35419b451acf81fdc3ed4acbec7ae696 (diff)
charsets: don't crash when passing a NULL string to the UTF-8 converter
-rw-r--r--src/mm-charsets.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mm-charsets.c b/src/mm-charsets.c
index e7e97f95..832a06ff 100644
--- a/src/mm-charsets.c
+++ b/src/mm-charsets.c
@@ -683,6 +683,9 @@ mm_charset_take_and_convert_to_utf8 (gchar *str,
{
gchar *utf8 = NULL;
+ if (!str)
+ return NULL;
+
switch (charset) {
case MM_MODEM_CHARSET_UNKNOWN:
g_warn_if_reached ();