]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-journal: don't assert on invalid field
authorFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 15 Nov 2023 20:44:33 +0000 (21:44 +0100)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 15 Nov 2023 21:31:02 +0000 (22:31 +0100)
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

index eb35b9d9c47cb20998ba8abf8568399b573f4649..f2b7a379c027e87849b36e23cd6837cf2328b1db 100644 (file)
@@ -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)