diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2012-11-27 10:48:48 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2012-11-27 13:25:25 +0100 |
| commit | e97b229e663dcd6d24a15fef51f13e2886ddf134 (patch) | |
| tree | 2545eb45d20269a62613e062d14803d06bebb494 | |
| parent | e6052a4abfde3550b0b9c2229adb0bb381ac4a06 (diff) | |
core: fix possible crash in g_utf8_validate()
We can skip additional UTF-8 validity check when parsing operator.
mm_charset_take_and_convert_to_utf8() already does a UTF-8 validity check
internally before returning the string, so it's pointless to do a new one
on the returned string.
Plus, mm_charset_take_and_convert_to_utf8() may really return NULL, which
would end up in segfaulting as g_utf8_validate() expects always a non-NULL
string.
Based on 219424a6e2d017491a05ecbed661bccde3f991ef (MM_06 branch)
| -rw-r--r-- | src/mm-modem-helpers.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 8cf9a29f..928fa6f3 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -1513,5 +1513,6 @@ mm_3gpp_parse_operator (const gchar *reply, */ - if (cur_charset == MM_MODEM_CHARSET_UCS2) + if (cur_charset == MM_MODEM_CHARSET_UCS2) { + /* In this case we're already checking UTF-8 validity */ operator = mm_charset_take_and_convert_to_utf8 (operator, MM_MODEM_CHARSET_UCS2); - + } /* Ensure the operator name is valid UTF-8 so that we can send it @@ -1519,3 +1520,3 @@ mm_3gpp_parse_operator (const gchar *reply, */ - if (!g_utf8_validate (operator, -1, NULL)) { + else if (!g_utf8_validate (operator, -1, NULL)) { g_free (operator); @@ -1527,3 +1528,3 @@ mm_3gpp_parse_operator (const gchar *reply, */ - if (g_ascii_strcasecmp (operator, "unknown") == 0) { + if (operator && g_ascii_strcasecmp (operator, "unknown") == 0) { g_free (operator); |