ui-ssdiff: ban strncpy()

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 066a470e5dd419b503bd4ff80646028079f844ad..b53c56dd126fd76c15a51a588355343282f9695e 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -133,20 +133,25 @@ const char *cgit_repobasename(const char *reponame)
        static char rvbuf[1024];
        int p;
        const char *rv;
-       strncpy(rvbuf, reponame, sizeof(rvbuf));
-       if (rvbuf[sizeof(rvbuf)-1])
+       size_t len;
+
+       len = strlcpy(rvbuf, reponame, sizeof(rvbuf));
+       if (len >= sizeof(rvbuf))
                die("cgit_repobasename: truncated repository name '%s'", reponame);
-       p = strlen(rvbuf)-1;
+       p = len - 1;
        /* strip trailing slashes */
-       while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
+       while (p && rvbuf[p] == '/')
+               rvbuf[p--] = '\0';
        /* strip trailing .git */
        if (p >= 3 && starts_with(&rvbuf[p-3], ".git")) {
-               p -= 3; rvbuf[p--] = 0;
+               p -= 3;
+               rvbuf[p--] = '\0';
        }
        /* strip more trailing slashes if any */
-       while ( p && rvbuf[p] == '/') rvbuf[p--] = 0;
+       while (p && rvbuf[p] == '/')
+               rvbuf[p--] = '\0';
        /* find last slash in the remaining string */
-       rv = strrchr(rvbuf,'/');
+       rv = strrchr(rvbuf, '/');
        if (rv)
                return ++rv;
        return rvbuf;
@@ -1154,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)
@@ -1171,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;
 }