summaryrefslogtreecommitdiff
path: root/ui-tree.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-08-13 11:54:46 +0100
committerJohn Keeping <john@keeping.me.uk>2016-10-01 11:46:55 +0100
commite18a85b6a298feef88da8085ef16fd20ce971071 (patch)
tree617a64efc192421222549ffe7ae522f5959c9ec5 /ui-tree.c
parentf80b73fa20d5c884114b971a20e1b4bb847e054e (diff)
downloadcgit-e18a85b6a298feef88da8085ef16fd20ce971071.tar.gz
cgit-e18a85b6a298feef88da8085ef16fd20ce971071.tar.bz2
cgit-e18a85b6a298feef88da8085ef16fd20ce971071.zip
ui-tree: remove a fixed size buffer
As libgit.a moves away from using fixed size buffers, there is no guarantee that PATH_MAX is sufficient for all of the paths in a Git tree, so we should use a dynamically sized buffer here. Coverity-Id: 141884 Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 5c31e6a..b98a7f0 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -324,22 +324,25 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *cbdata)
{
struct walk_tree_context *walk_tree_ctx = cbdata;
- static char buffer[PATH_MAX];
if (walk_tree_ctx->state == 0) {
- memcpy(buffer, base->buf, base->len);
- strcpy(buffer + base->len, pathname);
- if (strcmp(walk_tree_ctx->match_path, buffer))
+ struct strbuf buffer = STRBUF_INIT;
+
+ strbuf_addbuf(&buffer, base);
+ strbuf_addstr(&buffer, pathname);
+ if (strcmp(walk_tree_ctx->match_path, buffer.buf))
return READ_TREE_RECURSIVE;
if (S_ISDIR(mode)) {
walk_tree_ctx->state = 1;
- set_title_from_path(buffer);
+ set_title_from_path(buffer.buf);
+ strbuf_release(&buffer);
ls_head();
return READ_TREE_RECURSIVE;
} else {
walk_tree_ctx->state = 2;
- print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev);
+ print_object(sha1, buffer.buf, pathname, walk_tree_ctx->curr_rev);
+ strbuf_release(&buffer);
return 0;
}
}