From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 18 Jul 2012 11:10:09 +0000 (+0200)
Subject: journald: fix bad memory access
X-Git-Tag: v187~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=32fca2d5b746b86bbbbd4f1b57064076cfc2ae4b;hp=94469041d938809048d6e7a8655c23ed84e0b72a;ds=sidebyside

journald: fix bad memory access

After vacuuming we need to retrieve the journal file object again, since
it might have changed.
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d8cfa66b7..c29d75c9c 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -513,6 +513,10 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned
                 server_vacuum(s);
                 vacuumed = true;
 
+                f = find_journal(s, uid);
+                if (!f)
+                        return;
+
                 log_info("Retrying write.");
         }
 }