aboutsummaryrefslogtreecommitdiff
path: root/src/mm-charsets.c
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:06:59 -0600
commit1db000403319e6380e438ce627155a29b926d68e (patch)
treec504bab270e68c9a6cff7403025ea1ac3e9db888 /src/mm-charsets.c
parent7b4d6cf605fbf57a46fb1ef8777a6fdc49329c68 (diff)
charsets: don't crash when passing a NULL string to the UTF-8 converter
Diffstat (limited to 'src/mm-charsets.c')
-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 bc7eb516..913df0d6 100644
--- a/src/mm-charsets.c
+++ b/src/mm-charsets.c
@@ -714,6 +714,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 ();