diff options
| author |   Christian Hesse <mail@eworm.de> | 2018-08-28 20:33:02 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2018-09-11 08:47:12 +0200 |
| commit | 2fc008d6dea2456548825c973a5516b5cdfd9c8c (patch) | |
| tree | 9d900eded274af71e15f4d721f8ccee512b5b839 /ui-shared.c | |
| parent | ui-patch: ban sprintf() (diff) | |
| download | cgit-2fc008d6dea2456548825c973a5516b5cdfd9c8c.tar.xz cgit-2fc008d6dea2456548825c973a5516b5cdfd9c8c.zip | |
ui-shared: ban strcat()
Git upstream bans strcat() with commit:
banned.h: mark strcat() as banned
1b11b64b815db62f93a04242e4aed5687a448748
To avoid compiler warnings from gcc 8.1.x we get the hard way.
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to '')
| -rw-r--r-- | ui-shared.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index 739505a..b53c56d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -1159,7 +1159,7 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref, void cgit_set_title_from_path(const char *path) { - size_t path_len, path_index, path_last_end; + size_t path_len, path_index, path_last_end, line_len; char *new_title; if (!path) @@ -1176,14 +1176,18 @@ void cgit_set_title_from_path(const char *path) continue; } strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1); - strcat(new_title, "\\"); + line_len = strlen(new_title); + new_title[line_len++] = '\\'; + new_title[line_len] = '\0'; path_last_end = path_index; } } if (path_last_end) strncat(new_title, path, path_last_end); - strcat(new_title, " - "); - strcat(new_title, ctx.page.title); + line_len = strlen(new_title); + memcpy(&new_title[line_len], " - ", 3); + new_title[line_len + 3] = '\0'; + strncat(new_title, ctx.page.title, sizeof(new_title) - strlen(new_title) - 1); ctx.page.title = new_title; } |