diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-11-01 01:01:40 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-06 15:42:25 +0100 |
| commit | aa9de5b1c0ed9cd7ae0dec0dcaf19c18be846d7e (patch) | |
| tree | f36e7dbe02c9e6b8a05a6a266afa2edb4a1456e5 | |
| parent | process-util: rename function arguments for storing results (diff) | |
| download | systemd-aa9de5b1c0ed9cd7ae0dec0dcaf19c18be846d7e.tar.xz systemd-aa9de5b1c0ed9cd7ae0dec0dcaf19c18be846d7e.zip | |
process-util: handle double NUL as the end of command line
Fixes #21186.
| -rw-r--r-- | src/basic/process-util.c | 6 | ||||
| -rw-r--r-- | src/test/test-process-util.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 54648462ad..1b96d3ca85 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -214,11 +214,17 @@ int get_process_cmdline(pid_t pid, size_t max_columns, ProcessCmdlineFlags flags assert(!(flags & PROCESS_CMDLINE_USE_LOCALE)); _cleanup_strv_free_ char **args = NULL; + char **p; args = strv_parse_nulstr(t, k); if (!args) return -ENOMEM; + /* Drop trailing empty strings. See issue #21186. */ + STRV_FOREACH_BACKWARDS(p, args) + if (isempty(*p)) + *p = mfree(*p); + ans = quote_command_line(args, shflags); if (!ans) return -ENOMEM; diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index a180f3f9b4..ab093a7457 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -484,8 +484,8 @@ TEST(get_process_cmdline_harder) { /* Test with multiple arguments that do require quoting */ #define CMDLINE1 "foo\0'bar'\0\"bar$\"\0x y z\0!``\0" -#define EXPECT1 "foo \"'bar'\" \"\\\"bar\\$\\\"\" \"x y z\" \"!\\`\\`\" \"\"" -#define EXPECT1p "foo $'\\'bar\\'' $'\"bar$\"' $'x y z' $'!``' \"\"" +#define EXPECT1 "foo \"'bar'\" \"\\\"bar\\$\\\"\" \"x y z\" \"!\\`\\`\"" +#define EXPECT1p "foo $'\\'bar\\'' $'\"bar$\"' $'x y z' $'!``'" assert_se(lseek(fd, SEEK_SET, 0) == 0); assert_se(write(fd, CMDLINE1, sizeof CMDLINE1) == sizeof CMDLINE1); assert_se(ftruncate(fd, sizeof CMDLINE1) == 0); @@ -503,8 +503,8 @@ TEST(get_process_cmdline_harder) { line = mfree(line); #define CMDLINE2 "foo\0\1\2\3\0\0" -#define EXPECT2 "foo \"\\001\\002\\003\" \"\" \"\"" -#define EXPECT2p "foo $'\\001\\002\\003' \"\" \"\"" +#define EXPECT2 "foo \"\\001\\002\\003\"" +#define EXPECT2p "foo $'\\001\\002\\003'" assert_se(lseek(fd, SEEK_SET, 0) == 0); assert_se(write(fd, CMDLINE2, sizeof CMDLINE2) == sizeof CMDLINE2); assert_se(ftruncate(fd, sizeof CMDLINE2) == 0); |