From 9988043b6ba96b67bdb55fe5d5c7a46e0a993e3f Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 15 Nov 2023 21:44:33 +0100 Subject: [PATCH] sd-journal: don't assert on invalid field Also, field_is_valid(field) already does isempty(field), so drop that as well. $ SYSTEMD_LOG_LEVEL=debug journalctl -o verbose -F foo-bar-baz ... Assertion 'field_is_valid(field)' failed at src/libsystemd/sd-journal/sd-journal.c:2789, function sd_journal_query_unique(). Ignoring. Failed to query unique data objects: Invalid argument --- src/libsystemd/sd-journal/sd-journal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index eb35b9d9c4..f2b7a379c0 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -3121,8 +3121,9 @@ _public_ int sd_journal_query_unique(sd_journal *j, const char *field) { assert_return(j, -EINVAL); assert_return(!journal_origin_changed(j), -ECHILD); - assert_return(!isempty(field), -EINVAL); - assert_return(field_is_valid(field), -EINVAL); + + if (!field_is_valid(field)) + return -EINVAL; r = free_and_strdup(&j->unique_field, field); if (r < 0) -- 2.25.1