morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

run: escape command for description

Browse Source 
The command arguments may contain spurious characters, e.g. line-break.
When we use command arguments as a description of a unit, we should
escape them.

Fixes #30187.
This commit is contained in:
Yu Watanabe
2023-11-25 01:05:41 +09:00
parent 50f4469ed7
commit 2c29813da3
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/run/run.c
View File

@@ -18,6 +18,7 @@
#include "bus-wait-for-jobs.h"
#include "calendarspec.h"
#include "env-util.h"
#include "escape.h"
#include "exit-status.h"
#include "fd-util.h"
#include "format-util.h"
@@ -1932,17 +1933,19 @@ static int run(int argc, char* argv[]) {
}
if (!arg_description) {
description = strv_join(arg_cmdline, " ");
if (!description)
return log_oom();
if (arg_unit && isempty(description)) {
r = free_and_strdup(&description, arg_unit);
if (r < 0)
if (strv_isempty(arg_cmdline))
arg_description = arg_unit;
else {
_cleanup_free_ char *joined = strv_join(arg_cmdline, " ");
if (!joined)
return log_oom();
}
arg_description = description;
description = shell_escape(joined, "\"");
if (!description)
return log_oom();
arg_description = description;
}
}
/* For backward compatibility reasons env var expansion is disabled by default for scopes, and