From 479d7a9035851fe7c4be1240595831a2c1687689 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Georg=20M=C3=BCller?= Date: Thu, 12 Mar 2020 20:02:21 +0100 Subject: [PATCH] fix journalctl regression (#15099) This regression was introduced in #14913. The current_file variable can be NULL, as, for example, with the following commands: * journalctl --list-boots * journalctl -b -1 --no-pager Since current_file is only checked for pointer equality with f, removing the assertion is safe here. (cherry picked from commit 8d0726fcd7b72f2a6f75dd731cbf7c8d4df107ef) (cherry picked from commit e8df08cfdb20e31066559c53420d7fd56b31ec01) (cherry picked from commit a713f52ddb09e8ef606c12e559d787355c67aa7e) --- src/journal/sd-journal.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index a3da490b48..9583191700 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -439,7 +439,6 @@ _pure_ static int compare_with_location(const JournalFile *f, const Location *l, assert(f); assert(l); - assert(current_file); assert(f->location_type == LOCATION_SEEK); assert(IN_SET(l->type, LOCATION_DISCRETE, LOCATION_SEEK)); -- 2.25.1