chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v232: Add libelogind.sym entries for version 232.
[elogind.git]
/
src
/
basic
/
fs-util.c
diff --git
a/src/basic/fs-util.c
b/src/basic/fs-util.c
index 60925f2ac130e63581b200e46f24f72a6c21e12b..55f606cebc23d223150d44d427dd82c9dad83754 100644
(file)
--- a/
src/basic/fs-util.c
+++ b/
src/basic/fs-util.c
@@
-684,9
+684,7
@@
int chase_symlinks(const char *path, const char *_root, char **ret) {
!path_startswith(parent, root))
return -EINVAL;
!path_startswith(parent, root))
return -EINVAL;
- free(done);
- done = parent;
- parent = NULL;
+ free_and_replace(done, parent);
fd_parent = openat(fd, "..", O_CLOEXEC|O_NOFOLLOW|O_PATH);
if (fd_parent < 0)
fd_parent = openat(fd, "..", O_CLOEXEC|O_NOFOLLOW|O_PATH);
if (fd_parent < 0)
@@
-730,9
+728,7
@@
int chase_symlinks(const char *path, const char *_root, char **ret) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- free(buffer);
- buffer = destination;
- destination = NULL;
+ free_and_replace(buffer, destination);
todo = buffer;
free(done);
todo = buffer;
free(done);