shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-14 01:57:27 +03:00
Code

load-fragment: reset the list on an ExecStart= containing only whitespace

Browse Source 
This is consistent with how an empty string works in an ExecStart=
statement.  We should not differentiate between an empty string and
whitespace only (since they look the same.)

Update the test case with whitespace only to reflect that the list is
reset.

Tested that `test-unit-file` passes and other test cases are not
affected.  Installed the patched systemd binaries on a machine, booted
it, looked for out of the usual behavior but did not find any.
This commit is contained in:
Filipe Brandenburger 2015-06-05 23:12:25 -07:00
parent 46a0d98ac0
commit c83f1f30b8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/load-fragment.c
View File

@ -532,17 +532,15 @@ int config_parse_exec(
e += ltype;
/* FIXME: ExecStart=<empty> clears the list, but ExecStart=<whitespace>
* doesn't, they should behave the same. */
rvalue += strspn(rvalue, WHITESPACE);
p = rvalue;
if (isempty(rvalue)) {
/* An empty assignment resets the list */
*e = exec_command_free_list(*e);
return 0;
}
rvalue += strspn(rvalue, WHITESPACE);
p = rvalue;
do {
int i;
_cleanup_strv_free_ char **n = NULL;

6
src/test/test-unit-file.c
View File

@ -145,19 +145,19 @@ static void test_config_parse_exec(void) {
assert_se(r == 0);
assert_se(c1->command_next == NULL);
log_info("/* no command, check for bad memory access */");
log_info("/* no command, whitespace only, reset */");
r = config_parse_exec(NULL, "fake", 3, "section", 1,
"LValue", 0, " ",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
assert_se(c == NULL);
log_info("/* ignore && honour_argv0 */");
r = config_parse_exec(NULL, "fake", 4, "section", 1,
"LValue", 0, "-@/RValue///slashes3 argv0a r1",
&c, NULL);
assert_se(r >= 0);
c1 = c1->command_next;
c1 = c;
check_execcommand(c1, "/RValue/slashes3", "argv0a", "r1", NULL, true);
log_info("/* ignore && honour_argv0 */");