From 1ef3f462a3cfde20fafdda7e53610a9858f88350 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Mar 2015 10:18:22 -0500 Subject: in get_user_label(), don't dereference a NULL real_name pointer --- src/service.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/service.c') diff --git a/src/service.c b/src/service.c index 445f1af..5d2449e 100644 --- a/src/service.c +++ b/src/service.c @@ -295,12 +295,18 @@ get_user_label (const IndicatorSessionUser * user) { 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; + /* if real_name exists and isn't empty or whitespace, use it */ + c = user->real_name; + if (c != NULL) + { + while ((*c != '\0') && g_ascii_isspace(*c)) /* walk past whitespace */ + ++c; + if (*c != '\0') + return user->real_name; + } - return user->real_name; + /* otherwise, use this as a fallback */ + return user->user_name; } static const char * -- cgit v1.2.3