X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=2f043a48d544f25af757e87e511c0d6caeccec52;hp=9a40d69a754ae8e3a7a3a5b09a671c10aaf99277;hb=a54e3b3d6a4fe28a39729f4c5ad11cd26706110c;hpb=c2654883624885696edccd2a202873998ec208f1 diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 9a40d69a7..2f043a48d 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -744,7 +744,7 @@ static int get_relative_boot_id(sd_journal *j, sd_id128_t *boot_id, int relative if (!id || relative <= 0 ? (id - all_ids) + relative < 0 : - (id - all_ids) + relative >= count) + (id - all_ids) + relative >= (int) count) return -EADDRNOTAVAIL; *boot_id = (id + relative)->id; @@ -781,7 +781,7 @@ static int add_boot(sd_journal *j) { offset = arg_boot_descriptor + 32; - if (*offset != '-' && *offset != '+') { + if (*offset && *offset != '-' && *offset != '+') { log_error("Relative boot ID offset must start with a '+' or a '-', found '%s' ", offset); return -EINVAL; }