diff options
| -rw-r--r-- | src/shared/logs-show.c | 9 | ||||
| -rw-r--r-- | test/fuzz/fuzz-journal-remote/oss-fuzz-21122 | bin | 0 -> 35798 bytes |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 570377dc76..fee6ccdf2a 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -573,19 +573,22 @@ static int output_short( if (config_file && message_len >= config_file_len && memcmp(message, config_file, config_file_len) == 0 && - IN_SET(message[config_file_len], ':', ' ', '\0') && + (message_len == config_file_len || IN_SET(message[config_file_len], ':', ' ')) && (!highlight || highlight_shifted[0] == 0 || highlight_shifted[0] > config_file_len)) { _cleanup_free_ char *t = NULL, *urlified = NULL; t = strndup(config_file, config_file_len); if (t && terminal_urlify_path(t, NULL, &urlified) >= 0) { - size_t shift = strlen(urlified) - config_file_len; + size_t urlified_len = strlen(urlified); + size_t shift = urlified_len - config_file_len; char *joined; - joined = strjoin(urlified, message + config_file_len); + joined = realloc(urlified, message_len + shift); if (joined) { + memcpy(joined + urlified_len, message + config_file_len, message_len - config_file_len); free_and_replace(message, joined); + TAKE_PTR(urlified); message_len += shift; if (highlight) { highlight_shifted[0] += shift; diff --git a/test/fuzz/fuzz-journal-remote/oss-fuzz-21122 b/test/fuzz/fuzz-journal-remote/oss-fuzz-21122 Binary files differnew file mode 100644 index 0000000000..e0e05e1675 --- /dev/null +++ b/test/fuzz/fuzz-journal-remote/oss-fuzz-21122 |