From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 23 Mar 2013 03:11:23 +0000 (+0100)
Subject: journal: don't access j->files after use
X-Git-Tag: v199~59
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=54b1da83ed8cadde4a53b541a48ce303ade862f7;ds=sidebyside

journal: don't access j->files after use

https://bugs.freedesktop.org/show_bug.cgi?id=62605
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index f7f1777fe..82cacf367 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);