daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4fbe94
From 33aa231f5bf3335cdacfb38ffba757865019ce4d Mon Sep 17 00:00:00 2001
4fbe94
From: =?UTF-8?q?Renaud=20M=C3=A9trich?=
4fbe94
 <1163635+rmetrich@users.noreply.github.com>
4fbe94
Date: Mon, 3 Sep 2018 05:42:39 +0200
4fbe94
Subject: [PATCH] journald: fixed assertion failure when system journal
4fbe94
 rotation fails (#9893)
4fbe94
4fbe94
(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9)
4fbe94
4fbe94
Resolves: #1763619
4fbe94
---
4fbe94
 src/journal/journald-server.c | 3 ++-
4fbe94
 1 file changed, 2 insertions(+), 1 deletion(-)
4fbe94
4fbe94
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
4fbe94
index 0c983e102a..6aecb67d6c 100644
4fbe94
--- a/src/journal/journald-server.c
4fbe94
+++ b/src/journal/journald-server.c
4fbe94
@@ -1041,7 +1041,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
4fbe94
         r = 0;
4fbe94
 
4fbe94
 finish:
4fbe94
-        journal_file_post_change(s->system_journal);
4fbe94
+        if (s->system_journal)
4fbe94
+                journal_file_post_change(s->system_journal);
4fbe94
 
4fbe94
         s->runtime_journal = journal_file_close(s->runtime_journal);
4fbe94