From: Max Prokhorov Date: Mon, 13 Jun 2016 01:13:42 +0000 (+0300) Subject: util-lib: drop trailing non-printable characters from cmdline (#3512) X-Git-Tag: v231.3~101 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab6b3ad1c10768be64343940878617b1ae438c43;p=elogind.git util-lib: drop trailing non-printable characters from cmdline (#3512) If max_length is equal or greater than cmdline length all trailing non-printable characters are dropped. If max_length is 0 it should do the same. This should also fix cmdline truncation if the last character is not '\0'. Fixes #3469. --- diff --git a/src/basic/process-util.c b/src/basic/process-util.c index faadb756c..bcc5a45d8 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -101,6 +101,7 @@ int get_process_comm(pid_t pid, char **name) { int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) { _cleanup_fclose_ FILE *f = NULL; + bool space = false; char *r = NULL, *k; const char *p; int c; @@ -127,14 +128,21 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * return -ENOMEM; } - r[len++] = isprint(c) ? c : ' '; - } + if (isprint(c)) { + if (space) { + r[len++] = ' '; + space = false; + } + + r[len++] = c; + } else + space = true; + } if (len > 0) - r[len-1] = 0; + r[len] = 0; } else { - bool space = false; size_t left; r = new(char, max_length);