picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conf-parse: use path_simplify_and_warn() in config_parse_path()

This commit is contained in:
Yu Watanabe 2018-06-03 23:57:30 +09:00
parent 58a53adde5
commit cd4f53c5b5
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/conf-parser.c
View File

@ -713,6 +713,7 @@ int config_parse_path(
char **s = data, *n;
bool fatal = ltype;
int r;
assert(filename);
assert(lvalue);
@ -724,27 +725,16 @@ int config_parse_path(
goto finalize;
}
if (!utf8_is_valid(rvalue)) {
log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
return fatal ? -ENOEXEC : 0;
}
if (!path_is_absolute(rvalue)) {
log_syntax(unit, LOG_ERR, filename, line, 0,
"Not an absolute path%s: %s",
fatal ? "" : ", ignoring", rvalue);
return fatal ? -ENOEXEC : 0;
}
n = strdup(rvalue);
if (!n)
return log_oom();
path_simplify(n, false);
r = path_simplify_and_warn(n, PATH_CHECK_ABSOLUTE | (fatal ? PATH_CHECK_FATAL : 0), unit, filename, line, lvalue);
if (r < 0)
return fatal ? -ENOEXEC : 0;
finalize:
free(*s);
*s = n;
free_and_replace(*s, n);
return 0;
}

1
src/test/test-conf-parser.c
View File

@ -96,6 +96,7 @@ static void test_config_parse_path(void) {
test_config_parse_path_one("/path", "/path");
test_config_parse_path_one("/path//////////", "/path");
test_config_parse_path_one("///path/foo///bar////bar//", "/path/foo/bar/bar");
test_config_parse_path_one("/path//./////hogehoge///.", "/path/hogehoge");
test_config_parse_path_one("/path/\xc3\x80", "/path/\xc3\x80");
test_config_parse_path_one("not_absolute/path", NULL);