summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Prokhorov <prokhorov.max@outlook.com>2016-06-13 04:13:42 +0300
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-06-12 21:13:42 -0400
commitba4cd7e2573e591aa120655414d911f1a1882fe1 (patch)
tree7b2dd36f46be38f93a77364414e89db6f0e1ae83
parente7b90ddc345d1817ca48bfcc4e3e73836c8051af (diff)
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.
-rw-r--r--src/basic/process-util.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index b991e7c6ba..f6bde20fc5 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -102,6 +102,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;
@@ -128,14 +129,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);