diff options
| author | Georg Müller <georgmueller@gmx.net> | 2020-03-12 20:02:21 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-18 20:30:47 +0100 |
| commit | e8df08cfdb20e31066559c53420d7fd56b31ec01 (patch) | |
| tree | 1c186a54e4d57f3c77c6cb29c3ae95618de556d6 | |
| parent | eb3a38cc23b2481d3991429a9e0e09e82d6b5b2c (diff) | |
| download | systemd-e8df08cfdb20e31066559c53420d7fd56b31ec01.tar.gz | |
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)
| -rw-r--r-- | src/journal/sd-journal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 17998090f4..56a6a9c431 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -440,7 +440,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)); |