From dc4c3a5aa35a5e88adcf210471d9460262c8c0d9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 28 May 2019 12:40:17 +0900 Subject: [PATCH] journal: do not trigger assertion when journal_file_close() get NULL We generally expect destructors to not complain if a NULL argument is passed. Closes #12400. (cherry picked from commit c377a6f3ad3d9bed4ce7e873e8e9ec6b1650c57d) Resolves: #1788085 --- src/journal/journal-file.c | 3 ++- src/journal/journald-server.c | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index efc3ee052b..8249b11b23 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -335,7 +335,8 @@ bool journal_file_is_offlining(JournalFile *f) { } JournalFile* journal_file_close(JournalFile *f) { - assert(f); + if (!f) + return NULL; #if HAVE_GCRYPT /* Write the final tag */ diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 6aecb67d6c..6250eab831 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1906,11 +1906,8 @@ void server_done(Server *s) { client_context_flush_all(s); - if (s->system_journal) - (void) journal_file_close(s->system_journal); - - if (s->runtime_journal) - (void) journal_file_close(s->runtime_journal); + (void) journal_file_close(s->system_journal); + (void) journal_file_close(s->runtime_journal); ordered_hashmap_free_with_destructor(s->user_journals, journal_file_close);