summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-03-23 04:11:23 +0100
committerLennart Poettering <lennart@poettering.net>2013-03-23 04:14:20 +0100
commit54b1da83ed8cadde4a53b541a48ce303ade862f7 (patch)
treed5d80d4846fa1ff535d9fce4aa5235c616b5aafd /src
parent46512cd959f0a2bbeef3d9a08aa5be408cbf3521 (diff)
journal: don't access j->files after use
https://bugs.freedesktop.org/show_bug.cgi?id=62605
Diffstat (limited to 'src')
-rw-r--r--src/journal/sd-journal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index f7f1777fef..82cacf3674 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1658,6 +1658,8 @@ _public_ void sd_journal_close(sd_journal *j) {
if (!j)
return;
+ sd_journal_flush_matches(j);
+
while ((f = hashmap_steal_first(j->files)))
journal_file_close(f);
@@ -1675,8 +1677,6 @@ _public_ void sd_journal_close(sd_journal *j) {
if (j->inotify_fd >= 0)
close_nointr_nofail(j->inotify_fd);
- sd_journal_flush_matches(j);
-
if (j->mmap)
mmap_cache_unref(j->mmap);