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

fs-util: use _cleanup_close_ attribute 

The commit f14f1806e3 introduced CHASE_SAFE
flag. When the flag is set, then `fd_parent` may not be properly closed.
This sets `_cleanup_close_` attribute to `fd_parent`.
Thus, now `fd_parent` is always closed properly.
This commit is contained in:
Yu Watanabe 2018-01-21 19:07:10 +09:00
parent 91ec71c162
commit 2b6d2dda6b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/fs-util.c
View File

@ -730,7 +730,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
/* Two dots? Then chop off the last bit of what we already found out. */
if (path_equal(first, "/..")) {
_cleanup_free_ char *parent = NULL;
int fd_parent = -1;
_cleanup_close_ int fd_parent = -1;
/* If we already are at the top, then going up will not change anything. This is in-line with
* how the kernel handles this. */
@ -765,6 +765,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
safe_close(fd);
fd = fd_parent;
fd_parent = -1;
continue;
}