FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure only printable characters are used in the pretty cmdline display (bug 14172)

Browse Source
This commit is contained in:
Rozhuk Ivan
2018-05-27 12:00:01 +02:00
committed by Landry Breuil
parent fd149b63df
commit fd9e313e2e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/task-manager.c
View File

@@ -137,16 +137,21 @@ setting_changed (GObject *object, GParamSpec *pspec, XtmTaskManager *manager)
static gchar * static gchar *
pretty_cmdline (gchar *cmdline, gchar *comm) pretty_cmdline (gchar *cmdline, gchar *comm)
{ {
gchar *text = g_strchomp (g_strdelimit (g_strdup (cmdline), "\n\r", ' ')); /* Use the printable range of 0x20-0x7E */
if (!full_cmdline && g_utf8_strlen (text, -1) > 3) const gchar *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
"abcdefghijklmnopqrstuvwxyz{|}~";
gchar *text = g_strstrip (g_strcanon (g_strdup (cmdline), valid_chars, ' '));
gsize text_size = (gsize)strlen (text);
if (!full_cmdline && text_size > 3)
{ {
/* Shorten full path to commands and wine applications */ /* Shorten full path to commands and wine applications */
if (text[0] == '/' || (g_ascii_isupper (text[0]) && text[1] == ':' && text[2] == '\\')) if (text[0] == '/' || (g_ascii_isupper (text[0]) && text[1] == ':' && text[2] == '\\'))
{ {
gchar *p = g_strstr_len (text, -1, comm); gchar *p = g_strstr_len (text, (gssize)text_size, comm);
if (p != NULL) if (p != NULL)
{ {
g_strlcpy (text, p, g_utf8_strlen (text, -1)); g_strlcpy (text, p, text_size);
} }
} }
} }