SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tmpfiles: make sure not to concatenate non-absolute path

Browse Source 
If the path is absolute was only checked later.
Also do not check if path if absolute if we just
specified it starting with a slash.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-01-22 01:14:52 -05:00
parent 5f255144ae
commit 222c47f476
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tmpfiles/tmpfiles.c
+3 -5
View File
@@ -1321,7 +1321,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
case CREATE_SYMLINK:
if (!i->argument) {
i->argument = strappend("/usr/share/factory", i->path);
i->argument = strappend("/usr/share/factory/", i->path);
if (!i->argument)
return log_oom();
}
@@ -1336,12 +1336,10 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
case COPY_FILES:
if (!i->argument) {
i->argument = strappend("/usr/share/factory", i->path);
i->argument = strappend("/usr/share/factory/", i->path);
if (!i->argument)
return log_oom();
}
if (!path_is_absolute(i->argument)) {
} else if (!path_is_absolute(i->argument)) {
log_error("[%s:%u] Source path is not absolute.", fname, line);
return -EBADMSG;
}