diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-11-01 09:01:40 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-06 23:42:25 +0900 |
| commit | aa9de5b1c0ed9cd7ae0dec0dcaf19c18be846d7e (patch) | |
| tree | f36e7dbe02c9e6b8a05a6a266afa2edb4a1456e5 /src/basic/process-util.c | |
| parent | 95a511b704f7c2b3e9428b790444a985be0ead98 (diff) | |
| download | systemd-aa9de5b1c0ed9cd7ae0dec0dcaf19c18be846d7e.tar.gz | |
process-util: handle double NUL as the end of command line
Fixes #21186.
Diffstat (limited to 'src/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 6 |
1 files changed, 6 insertions, 0 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; |