[PATCH 4/4] ui-tree: remove a fixed size buffer
John Keeping
john at keeping.me.uk
Sat Aug 13 13:04:32 CEST 2016
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 at keeping.me.uk>
---
ui-tree.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ui-tree.c b/ui-tree.c
index 120066c..9966f75 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -258,22 +258,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;
}
}
--
2.9.2.639.g855ae9f
More information about the CGit
mailing list