systemd / systemd / 15889795658

72%

Build Type

push

github

Committed by yuwata

Commit Message

journal-gatewayd: fix handling of num_skip pointing beyond the last entry

When `num_skip` is supplied to the `Range` header, journal-gatewayd
always returns the very last record even though it should have been
skipped. This is because the `sd_journal_next_skip` always returns
non-zero value on the first call, leading to one iteration of the
`request_reader_entries` returning the last record.

To avoid this unexpected behavior, check that the number of lines we
have skipped by is not lower than the requested skip value. If it is,
then it means there are lines which should not be returned now -
decrement the n_skip counter then and return from the function, closing
the stream if follow flag is not set.

Fixes #37954

Run Details

6 of 8 new or added lines in 1 file covered. (75.0%)

168 existing lines in 33 files now uncovered.

300532 of 416788 relevant lines covered (72.11%)

712881.46 hits per line