Merge lp:~seb128/indicator-session/backport_get_user_label_segfix into lp:indicator-session/14.04

[Sebastien Bacher]

Backport fix for segfault in get_user_label() (lp: #1501244)

Backport fix for segfault in get_user_label() (lp: #1501244)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2014-04-02 15:02:59 +0000
+++ src/service.c	2015-10-05 15:23:22 +0000
@@ -295,12 +295,21 @@
 {
   const char * c;
 
-  /* If blank or whitespace, use username instead */
-  for (c = user->real_name; *c != '\0' && g_ascii_isspace (*c); c++);
-  if (*c == '\0')
-    return user->user_name;
-
-  return user->real_name;
+  /* if real_name exists and is printable, use it */
+  c = user->real_name;
+  if ((c != NULL) && g_utf8_validate(c, -1, NULL))
+    {
+      while (*c != '\0')
+        {
+          if (g_unichar_isgraph(g_utf8_get_char(c)))
+            return user->real_name;
+
+          c = g_utf8_next_char(c);
+        }
+    }
+
+  /* otherwise, use this as a fallback */
+  return user->user_name;
 }
 
 static const char *