clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-05 21:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

journald: fix fd leak in journal_file_empty

Browse Source 
Before my previous patch, journal_file_empty wasn't be called with the
correct filename. Now that it's being called with the correct filename
it leaks file descriptors. This patch closes the file descriptors before
returning.

Signed-off-by: George McCollister <george.mccollister@gmail.com>

[Edit harald@redhat.com: make use of _cleanup_close_ instead]
This commit is contained in:
George McCollister
2013-10-21 16:44:05 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 2bb5cce6ae
commit e5e1a36447
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journal-vacuum.c
+2 -1
View File
@@ -129,8 +129,9 @@ static void patch_realtime(
}
static int journal_file_empty(int dir_fd, const char *name) {
int fd, r;
int r;
le64_t n_entries;
_cleanup_close_ int fd;
fd = openat(dir_fd, name, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK);
if (fd < 0)