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 f7f1777fef110c12e8b5b41a8f8ab241df95791d..82cacf3674446cd6cc600277da4a8e13364d1539 100644 (file)
--- 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;
 
         if (!j)
                 return;
 

+        sd_journal_flush_matches(j);
+

         while ((f = hashmap_steal_first(j->files)))
                 journal_file_close(f);
 
         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);
 
         if (j->inotify_fd >= 0)
                 close_nointr_nofail(j->inotify_fd);
 

-        sd_journal_flush_matches(j);
-

         if (j->mmap)
                 mmap_cache_unref(j->mmap);
 
         if (j->mmap)
                 mmap_cache_unref(j->mmap);