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:
parent
91ec71c162
commit
2b6d2dda6b
|
@ -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. */
|
/* Two dots? Then chop off the last bit of what we already found out. */
|
||||||
if (path_equal(first, "/..")) {
|
if (path_equal(first, "/..")) {
|
||||||
_cleanup_free_ char *parent = NULL;
|
_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
|
/* If we already are at the top, then going up will not change anything. This is in-line with
|
||||||
* how the kernel handles this. */
|
* how the kernel handles this. */
|
||||||
|
@ -765,6 +765,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
|
||||||
|
|
||||||
safe_close(fd);
|
safe_close(fd);
|
||||||
fd = fd_parent;
|
fd = fd_parent;
|
||||||
|
fd_parent = -1;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue